From b34cc9fd596e7b5e8198046a79a739f63dc9c23e Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Mon, 30 Dec 2019 02:39:43 -0800 Subject: [PATCH] Add hard cap of 20 to feed command --- .../denizen/events/core/ListPingScriptEvent.java | 2 -- .../denizen/scripts/commands/entity/FeedCommand.java | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/core/ListPingScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/core/ListPingScriptEvent.java index f69cab4161..8420e81a06 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/core/ListPingScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/core/ListPingScriptEvent.java @@ -1,7 +1,6 @@ package com.denizenscript.denizen.events.core; import com.denizenscript.denizen.events.BukkitScriptEvent; -import com.denizenscript.denizen.utilities.debugging.Debug; import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.objects.core.ListTag; import com.denizenscript.denizencore.objects.ObjectTag; @@ -61,7 +60,6 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { } else { event.setMotd(determination); - Debug.log("MOTD Set: " + determination); } return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java index b07eb06b07..a2d5409944 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java @@ -117,7 +117,9 @@ public void execute(ScriptEntry scriptEntry) { npc.getCitizen().getTrait(HungerTrait.class).feed(amount.asInt()); } else { - player.getPlayerEntity().setFoodLevel(Math.max(0, Math.min(9999, player.getPlayerEntity().getFoodLevel() + amount.asInt()))); + int result = Math.max(0, Math.min(20, player.getPlayerEntity().getFoodLevel() + amount.asInt())); + player.getPlayerEntity().setFoodLevel(result); + Debug.echoDebug(scriptEntry, "Player food level updated to " + result + "."); } } }