From 6681d1d8a9ddb662492d21f22d56079eec2b6383 Mon Sep 17 00:00:00 2001
From: IUDevman <58370012+IUDevman@users.noreply.github.com>
Date: Wed, 16 Dec 2020 08:02:27 -0600
Subject: [PATCH] Updated PvPInfo null check

---
 .../client/module/modules/misc/PvPInfo.java   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gamesense/client/module/modules/misc/PvPInfo.java b/src/main/java/com/gamesense/client/module/modules/misc/PvPInfo.java
index 3ca508377..0e03445f0 100644
--- a/src/main/java/com/gamesense/client/module/modules/misc/PvPInfo.java
+++ b/src/main/java/com/gamesense/client/module/modules/misc/PvPInfo.java
@@ -67,8 +67,11 @@ public void setup(){
 	}
 
 	public void onUpdate() {
+		if (mc.player == null || mc.world == null) {
+			return;
+		}
+
 		if (visualRange.getValue()) {
-			if (mc.player == null) return;
 			players = mc.world.loadedEntityList.stream().filter(e -> e instanceof EntityPlayer).collect(Collectors.toList());
 			try {
 				for (Entity e : players) {
@@ -80,7 +83,7 @@ public void onUpdate() {
 					}
 				}
 			} catch (Exception e) {
-			} // ez no crasherino
+			}
 			try {
 				for (Entity e : knownPlayers) {
 					if (e instanceof EntityPlayer && !e.getName().equalsIgnoreCase(mc.player.getName())) {
@@ -90,7 +93,7 @@ public void onUpdate() {
 					}
 				}
 			} catch (Exception e) {
-			} // ez no crasherino pt.2
+			}
 		}
 		if (pearlAlert.getValue()) {
 			pearls = mc.world.loadedEntityList.stream().filter(e -> e instanceof EntityEnderPearl).collect(Collectors.toList());
@@ -106,7 +109,7 @@ public void onUpdate() {
 			} catch (Exception e) {
 			}
 		}
-		if (strengthDetect.getValue() && mc.player != null && mc.world != null) {
+		if (strengthDetect.getValue()) {
 			for (EntityPlayer player : mc.world.playerEntities){
 				if (player.isPotionActive(MobEffects.STRENGTH) && !(strengthedPlayers.contains(player))){
 					MessageBus.sendClientPrefixMessage(getTextColor() + player.getName() + " has (drank) strength!");
@@ -118,7 +121,7 @@ public void onUpdate() {
 				}
 			}
 		}
-		if (popCounter.getValue() && mc.world != null && mc.player != null) {
+		if (popCounter.getValue()) {
 			for (EntityPlayer player : mc.world.playerEntities) {
 				if (player.getHealth() <= 0) {
 					if (popCounterHashMap.containsKey(player.getDisplayNameString())) {
@@ -132,10 +135,10 @@ public void onUpdate() {
 
 	@EventHandler
 	private final Listener<PacketEvent.Receive> packetEventListener = new Listener<>(event -> {
-
 		if (mc.world == null || mc.player == null){
 			return;
 		}
+
 		if (event.getPacket() instanceof SPacketEntityStatus){
 			SPacketEntityStatus packet = (SPacketEntityStatus) event.getPacket();
 			if (packet.getOpCode() == 35){
@@ -147,6 +150,10 @@ public void onUpdate() {
 
 	@EventHandler
 	private final Listener<TotemPopEvent> totemPopEventListener = new Listener<>(event -> {
+		if (mc.world == null || mc.player == null){
+			return;
+		}
+
 		if (popCounter.getValue()) {
 			if (popCounterHashMap == null) {
 				popCounterHashMap = new HashMap<>();