Resolving conflict with JourneyMap (fixes #202)

WesCook · Feb 12, 2020 · cab0e06 · cab0e06
1 parent 4c9a2b1
commit cab0e06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/ca/wescook/nutrition/events/EventPlayerJoinWorld.java b/src/main/java/ca/wescook/nutrition/events/EventPlayerJoinWorld.java
@@ -5,6 +5,7 @@
 import ca.wescook.nutrition.capabilities.SimpleImpl;
 import ca.wescook.nutrition.network.Sync;
 import ca.wescook.nutrition.proxy.ClientProxy;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
@@ -26,7 +27,7 @@ public void AttachCapabilitiesEvent(AttachCapabilitiesEvent<Entity> event) {
 		// Start tracking nutrition
 		if (!entity.getEntityWorld().isRemote) // Server
 			event.addCapability(new ResourceLocation(Nutrition.MODID, "nutrition"), new CapabilityManager.Provider()); // Attach capability to player
-		else // Client
+		else if (entity instanceof EntityPlayerSP) // Client.  Extra check to ensure it's EntityPlayerSP, not EntityOtherPlayerMP
 			ClientProxy.localNutrition = new SimpleImpl(); // Initialize local dummy copy
 	}
 

diff --git a/src/main/java/ca/wescook/nutrition/gui/NutritionGui.java b/src/main/java/ca/wescook/nutrition/gui/NutritionGui.java
@@ -60,7 +60,7 @@ private void drawNutritionBars() {
 		int i = 0;
 		for (Nutrient nutrient : NutrientList.getVisible()) {
 			// Calculate percentage width for nutrition bars
-			float currentNutrient = (ClientProxy.localNutrition != null && ClientProxy.localNutrition.get(nutrient) != null) ? Math.round(ClientProxy.localNutrition.get(nutrient)) : 0; // If null, setPlayerNutrition to 0, else get true value
+			float currentNutrient = (ClientProxy.localNutrition != null && ClientProxy.localNutrition.get(nutrient) != null) ? Math.round(ClientProxy.localNutrition.get(nutrient)) : 0; // Display empty if null
 			int nutritionBarDisplayWidth = (int) (currentNutrient / 100 * NUTRITION_BAR_WIDTH);
 
 			// Draw icons