Merge pull request fr1kin#75 from VADemon/logoutspot-fix

Fix NPE in LogoutSpot, add @nullable to getWorld
ItzFish · Mar 4, 2019 · 9fb0e0c · 9fb0e0c
2 parents c1d38ba + 8a16b08
commit 9fb0e0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/main/java/com/matt/forgehax/Helper.java b/src/main/java/com/matt/forgehax/Helper.java
@@ -66,6 +66,7 @@ public static Entity getRidingOrPlayer() {
     return getRidingEntity() != null ? getRidingEntity() : getLocalPlayer();
   }
 
+  @Nullable
   public static WorldClient getWorld() {
     return MC.world;
   }

diff --git a/src/main/java/com/matt/forgehax/mods/LogoutSpot.java b/src/main/java/com/matt/forgehax/mods/LogoutSpot.java
@@ -98,6 +98,8 @@ public void onPlayerConnect(PlayerConnectEvent.Join event) {
 
   @SubscribeEvent
   public void onPlayerDisconnect(PlayerConnectEvent.Leave event) {
+    if (getWorld() == null) return;
+
     EntityPlayer player = getWorld().getPlayerEntityByUUID(event.getPlayerInfo().getId());
     if (player != null && getLocalPlayer() != null && !getLocalPlayer().equals(player)) {
       AxisAlignedBB bb = player.getEntityBoundingBox();