From 06e481a80b314837e5a97251d29ed3ff47b4d50c Mon Sep 17 00:00:00 2001
From: Rigamortis <seththaller@gmail.com>
Date: Sat, 30 Nov 2019 16:08:52 -0900
Subject: [PATCH] Fixed a bug with visual range and a GL bug with logoutspots

---
 .../seppuku/impl/module/misc/ChatTimeStampsModule.java        | 1 -
 .../seppuku/impl/module/misc/VisualRangeModule.java           | 4 ++--
 .../seppuku/impl/module/render/LogoutSpotsModule.java         | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatTimeStampsModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatTimeStampsModule.java
index 241f57e..1f02359 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatTimeStampsModule.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatTimeStampsModule.java
@@ -23,7 +23,6 @@ public final class ChatTimeStampsModule extends Module {
         TWELVE, TWENTY_FOUR
     }
 
-
     public ChatTimeStampsModule() {
         super("ChatTimeStamps", new String[]{"ChatStamp", "ChatStamps"}, "Appends a time stamp on chat messages", "NONE", -1, ModuleType.MISC);
     }
diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/VisualRangeModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/VisualRangeModule.java
index cd39658..b5e7f38 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/VisualRangeModule.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/VisualRangeModule.java
@@ -24,7 +24,7 @@ public final class VisualRangeModule extends Module {
 
     @Listener
     public void onEntityAdded(EventAddEntity event) {
-        if (!Minecraft.getMinecraft().player.isDead && event.getEntity() instanceof EntityPlayer && !event.getEntity().getName().equalsIgnoreCase(Minecraft.getMinecraft().player.getName())) {
+        if (Minecraft.getMinecraft().world != null && !Minecraft.getMinecraft().player.isDead && event.getEntity() instanceof EntityPlayer && !event.getEntity().getName().equalsIgnoreCase(Minecraft.getMinecraft().player.getName())) {
             final Friend friend = Seppuku.INSTANCE.getFriendManager().isFriend(event.getEntity());
             final String msg = (friend != null ? ChatFormatting.DARK_PURPLE : ChatFormatting.RED) + (friend != null ? friend.getAlias() : event.getEntity().getName()) + ChatFormatting.WHITE + " has entered your visual range.";
             Seppuku.INSTANCE.getNotificationManager().addNotification("", msg);
@@ -37,7 +37,7 @@ public final class VisualRangeModule extends Module {
 
     @Listener
     public void onEntityRemove(EventRemoveEntity event) {
-        if (!Minecraft.getMinecraft().player.isDead && event.getEntity() instanceof EntityPlayer && !event.getEntity().getName().equalsIgnoreCase(Minecraft.getMinecraft().player.getName())) {
+        if (Minecraft.getMinecraft().world != null && !Minecraft.getMinecraft().player.isDead && event.getEntity() instanceof EntityPlayer && !event.getEntity().getName().equalsIgnoreCase(Minecraft.getMinecraft().player.getName())) {
             if (this.prevPlayer != event.getEntity().getEntityId()) {
                 this.prevPlayer = event.getEntity().getEntityId();
                 final Friend friend = Seppuku.INSTANCE.getFriendManager().isFriend(event.getEntity());
diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/render/LogoutSpotsModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/render/LogoutSpotsModule.java
index e2a606c..f36c6ac 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/module/render/LogoutSpotsModule.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/module/render/LogoutSpotsModule.java
@@ -73,13 +73,11 @@ public final class LogoutSpotsModule extends Module {
             GlStateManager.pushMatrix();
             GlStateManager.enableLighting();
             GlStateManager.enableBlend();
-            GlStateManager.enableAlpha();
             GlStateManager.enableDepth();
             GlStateManager.color(1, 1, 1, 1);
             mc.getRenderManager().renderEntity(data.ghost, data.position.x - mc.getRenderManager().renderPosX, data.position.y - mc.getRenderManager().renderPosY, data.position.z - mc.getRenderManager().renderPosZ, data.ghost.rotationYaw, mc.getRenderPartialTicks(), false);
             GlStateManager.disableLighting();
             GlStateManager.disableBlend();
-            GlStateManager.disableAlpha();
             GlStateManager.popMatrix();
         }
     }