Added Null checks

ObstacleSM · Aug 31, 2019 · ffe9d38 · ffe9d38
1 parent 96dc787
commit ffe9d38
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 5 deletions.
diff --git a/Scripts/Libs/smokegun/Items.Script.txt b/Scripts/Libs/smokegun/Items.Script.txt
@@ -153,6 +153,7 @@ Text CreateLayerItems() {
 
  declare LocalPlayer <=> InputPlayer;
  if (GUIPlayer != Null && GUIPlayer != LocalPlayer) LocalPlayer <=> GUIPlayer;
+ if (LocalPlayer == Null) continue;
 
  declare Index = 1;
  declare netread Integer[Text] ItemBuffTimes for LocalPlayer = [];
@@ -207,11 +208,11 @@ Text CreateLayerItems() {
  Ratio = 1.;
  }
  Gauge_Item.Ratio = Ratio;
- 
+
  declare TimeDiffText = ML::NearestInteger(TimeDiff / 100.) / 10.;
  Label_Time.Value = TimeDiffText^"s";
  }
- 
+
  declare ItemParts = TL::Split("\\", ItemName);
  ItemParts = TL::Split(".", ItemParts[ItemParts.count-1]);
  Label_Item.Value = ItemParts[0];
@@ -245,4 +246,4 @@ Text CreateLayerItems() {
  </frame>
 </manialink>""";
  return Manialink;
-}
+}
diff --git a/Scripts/Libs/smokegun/UI/Chrono.Script.txt b/Scripts/Libs/smokegun/UI/Chrono.Script.txt
@@ -40,6 +40,7 @@ Text GetLayer() {
 
  declare LocalPlayer <=> InputPlayer;
  if (GUIPlayer != Null) LocalPlayer <=> GUIPlayer;
+ if (LocalPlayer == Null) continue;
 
  declare netread Net_UsedJump for LocalPlayer = False;
  if (PrevUsedJump != Net_UsedJump) {

diff --git a/Scripts/Libs/smokegun/UI/CpProgress.Script.txt b/Scripts/Libs/smokegun/UI/CpProgress.Script.txt
@@ -43,6 +43,7 @@ Text GetLayer() {
 
  declare LocalPlayer <=> InputPlayer;
  if (GUIPlayer != Null) LocalPlayer <=> GUIPlayer;
+ if (LocalPlayer == Null) continue;
 
  declare netread Net_CheckpointsTotal for Teams[0] = -1;
  declare netread Net_StartTime for LocalPlayer = -1;

diff --git a/Scripts/Libs/smokegun/UI/Markers.Script.txt b/Scripts/Libs/smokegun/UI/Markers.Script.txt
@@ -123,6 +123,7 @@ main() {
 
  declare LocalPlayer <=> InputPlayer;
  if (GUIPlayer != Null) LocalPlayer <=> GUIPlayer;
+ if (LocalPlayer == Null) continue;
 
  declare netread Integer Net_CpProgress for LocalPlayer;
  declare netread Text[] LastCheckpointsIdsStr for LocalPlayer;

diff --git a/Scripts/Libs/smokegun/UI/NextMapVote.Script.txt b/Scripts/Libs/smokegun/UI/NextMapVote.Script.txt
@@ -69,6 +69,7 @@ Text GetLayer(Real _NextMapVotingRatio) {
 
  declare LocalPlayer <=> InputPlayer;
  if (GUIPlayer != Null) LocalPlayer <=> GUIPlayer;
+ if (LocalPlayer == Null) continue;
 
  // Process events
  foreach (Event in PendingEvents) {

diff --git a/Scripts/Libs/smokegun/UI/SpecKeys.Script.txt b/Scripts/Libs/smokegun/UI/SpecKeys.Script.txt
@@ -134,6 +134,7 @@ Text GetLayer() {
  Void UpdateSpec() {
  declare LocalPlayer <=> InputPlayer;
  if (GUIPlayer != Null) LocalPlayer <=> GUIPlayer;
+ if (LocalPlayer == Null) return;
 
  declare netread Keys LastKeys for LocalPlayer;
  log("Spec "^LastKeys);
@@ -217,4 +218,4 @@ Text GetLayer() {
  }
 --></script>
 </manialink>""";
-}
+}
diff --git a/Scripts/Libs/smokegun/UI/SpectatorCount.Script.txt b/Scripts/Libs/smokegun/UI/SpectatorCount.Script.txt
@@ -56,7 +56,7 @@ Text GetLayer() {
 
  declare LocalPlayer <=> InputPlayer;
  if (GUIPlayer != Null) LocalPlayer <=> GUIPlayer;
-
+ if (LocalPlayer == Null) continue;
 
  declare netread Net_NbSpectating for LocalPlayer = 0;
  if (LastNbSpectating != Net_NbSpectating)

diff --git a/Scripts/Libs/smokegun/UI/TimeDiff.Script.txt b/Scripts/Libs/smokegun/UI/TimeDiff.Script.txt
@@ -43,6 +43,7 @@ Text GetLayer() {
 
  declare LocalPlayer <=> InputPlayer;
  if (GUIPlayer != Null) LocalPlayer <=> GUIPlayer;
+ if (LocalPlayer == Null) continue;
 
  declare netread Net_LayerTimeDiffUpdated for LocalPlayer = 0;
  declare netread Net_Time1 for LocalPlayer = 0;

diff --git a/Scripts/Modes/ShootMania/Obstacle.Script.txt b/Scripts/Modes/ShootMania/Obstacle.Script.txt
@@ -246,6 +246,10 @@ foreach (Event in PendingEvents) {
  // Discard the defaut behaviour (e.g Player is eliminated)
  Discard(Event);
 
+ if (Event.Victim == Null) {
+ continue;
+ }
+
  // Dont respawn if the player has the offzone item
  if (Event.Victim.IsInOffZone) {
  declare ItemBuffs = Player::getBuffTimes(Event.Victim);