Skip to content

Commit 236e675

Browse files
authored
Fix client detection (#20)
1 parent da690c7 commit 236e675

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

src/main/java/ca/wescook/nutrition/events/EventEatFood.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.minecraft.item.ItemBucketMilk;
77
import net.minecraftforge.event.entity.player.PlayerUseItemEvent;
88

9-
import ca.wescook.nutrition.Nutrition;
109
import ca.wescook.nutrition.data.PlayerDataHandler;
1110
import ca.wescook.nutrition.effects.EffectsManager;
1211
import ca.wescook.nutrition.nutrients.Nutrient;
@@ -44,7 +43,7 @@ public class EventEatFood {
4443

4544
@SubscribeEvent
4645
public void onFoodStatsChanged(FoodEvent.FoodStatsAddition event) {
47-
if (Nutrition.proxy.isClient()) {
46+
if (event.player.getEntityWorld().isRemote) { // Client
4847
// only run if hunger value increases, also ignoring saturation
4948
int hungerValue = event.foodValuesToBeAdded.hunger;
5049
if (hungerValue <= 0) return;
@@ -64,9 +63,7 @@ public void onFoodEaten(FoodEvent.FoodEaten event) {
6463
if (!event.player.getEntityWorld().isRemote) { // Server
6564
PlayerDataHandler.getForPlayer(event.player)
6665
.add(foundNutrients, nutritionValue);
67-
}
68-
69-
if (Nutrition.proxy.isClient()) { // Client
66+
} else { // Client
7067
ClientProxy.localNutrition.add(foundNutrients, nutritionValue);
7168
// set that food has now been eaten
7269
ClientProxy.popHungerChange();

src/main/java/ca/wescook/nutrition/proxy/ClientProxy.java

-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ public void init(FMLInitializationEvent event) {
3838
}
3939
}
4040

41-
@Override
42-
public boolean isClient() {
43-
return true;
44-
}
45-
4641
public static void pushHungerChange(int hungerValue) {
4742
hungerValues.push(hungerValue);
4843
}

src/main/java/ca/wescook/nutrition/proxy/CommonProxy.java

-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,4 @@ public void init(FMLInitializationEvent event) {
1818
public void postInit(FMLPostInitializationEvent event) {
1919
ModHelperManager.postInit();
2020
}
21-
22-
public boolean isClient() {
23-
return false;
24-
}
2521
}

0 commit comments

Comments
 (0)