Skip to content

Prevent frivolous exceptions #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
corkr900 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prevent frivolous exceptions #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d0559b
Don't throw frivolous exceptions
corkr900 Feb 10, 2024
106741e
Fix crash on hot reload
corkr900 Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _Code/Entities/Spawnpoints.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ private static void Player_Added(On.Celeste.Player.orig_Added orig, Player self,
if (scene is Level level) {
try {
LevelData l = level.Session.MapData.Levels.First(_l => _l.Name == level.Session.Level);
var e = l.Entities.First(_e => trueSpawnPoints.Contains(_e.Name) && _e.Position == self.Position);
if (e.Bool("forceFacing", true))
var e = l.Entities.FirstOrDefault(_e => trueSpawnPoints.Contains(_e.Name) && _e.Position == self.Position);
if (e != null && e.Bool("forceFacing", true))
self.Facing = e.Bool("flipX", false) ? Facings.Left : Facings.Right;
return;

Expand Down
18 changes: 18 additions & 0 deletions _Code/Module, Extensions, Etc/CustomDashStateCh.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@ public Vector2 CustomDashDir(Vector2 pDashDir, Vector2 pSpeed) {
}

public static void LoadPresets() {
if (presetCustomBoosterStates.ContainsKey("Default")) {
presetCustomBoosterStates.Remove("Default");
}
presetCustomBoosterStates.Add("Default", new EntityData {
Values = new Dictionary<string, object>
{
Expand All @@ -267,6 +270,9 @@ public static void LoadPresets() {
{"ColorSet", "000000,8cf7cf,4acfc6,1c7856,0e4a36,172b21,0e1c15,ffffff,291c33" }
}
});
if (presetCustomBoosterStates.ContainsKey("Superdash")) {
presetCustomBoosterStates.Remove("Superdash");
}
presetCustomBoosterStates.Add("Superdash", new EntityData {
Values = new Dictionary<string, object>
{
Expand All @@ -278,6 +284,9 @@ public static void LoadPresets() {
{"ColorSet", "000000,5cd4ff,5ca6e5,005c7b,003146,192d33,191922,ffffff,291c33" },
}
});
if (presetCustomBoosterStates.ContainsKey("FragileDash")) {
presetCustomBoosterStates.Remove("FragileDash");
}
presetCustomBoosterStates.Add("FragileDash", new EntityData {
Values = new Dictionary<string, object>
{
Expand All @@ -287,6 +296,9 @@ public static void LoadPresets() {
{"ColorSet", "000000,ffffa7,b2ef5f,84912e,555f1f,3e3e28,2e2e1f,ffffff,291c33" },
}
});
if (presetCustomBoosterStates.ContainsKey("HeldDash")) {
presetCustomBoosterStates.Remove("HeldDash");
}
presetCustomBoosterStates.Add("HeldDash", new EntityData {
Values = new Dictionary<string, object>
{
Expand All @@ -297,6 +309,9 @@ public static void LoadPresets() {
{"ColorSet", "000000,f1ceab,e5a565,9c5b1a,5f3f10,3d230a,271707,ffffff,291c33" },
}
});
if (presetCustomBoosterStates.ContainsKey("DoubleSpeed")) {
presetCustomBoosterStates.Remove("DoubleSpeed");
}
presetCustomBoosterStates.Add("DoubleSpeed", new EntityData {
Values = new Dictionary<string, object>
{
Expand All @@ -306,6 +321,9 @@ public static void LoadPresets() {
{"ColorSet", "000000,ceffff,62ffff,16ad75,006241,0e2f1e,00160b,ffffff,291c33" },
}
});
if (presetCustomBoosterStates.ContainsKey("HeldSuperdash")) {
presetCustomBoosterStates.Remove("HeldSuperdash");
}
presetCustomBoosterStates.Add("HeldSuperdash", new EntityData {
Values = new Dictionary<string, object>
{
Expand Down