Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-27 21:15:57 +01:00
Code Issues Projects Releases Wiki Activity

Added the missing timer to the food flags.

Browse Source
This commit is contained in:
Wizjany 2011-10-04 16:26:54 -04:00
parent 6285a66d76
commit 810501a508
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java
View File

@ -148,6 +148,8 @@ private void processHeal(ApplicableRegionSet applicable, Player player,
private void processFeed(ApplicableRegionSet applicable, Player player, private void processFeed(ApplicableRegionSet applicable, Player player,
PlayerFlagState state) { PlayerFlagState state) {
long now = System.currentTimeMillis();
Integer feedAmount = applicable.getFlag(DefaultFlag.FEED_AMOUNT); Integer feedAmount = applicable.getFlag(DefaultFlag.FEED_AMOUNT);
Integer feedDelay = applicable.getFlag(DefaultFlag.FEED_DELAY); Integer feedDelay = applicable.getFlag(DefaultFlag.FEED_DELAY);
Integer minHunger = applicable.getFlag(DefaultFlag.MIN_FOOD); Integer minHunger = applicable.getFlag(DefaultFlag.MIN_FOOD);
@ -164,8 +166,8 @@ private void processFeed(ApplicableRegionSet applicable, Player player,
} }
if (feedDelay <= 0) { if (feedDelay <= 0) {
player.setFoodLevel(feedAmount > 0 ? maxHunger : minHunger); // this will insta-kill if the flag is unset player.setFoodLevel(feedAmount > 0 ? maxHunger : minHunger);
} else { } else if (now - state.lastFeed > feedDelay * 1000) {
// clamp health between minimum and maximum // clamp health between minimum and maximum
player.setFoodLevel(Math.min(maxHunger, Math.max(minHunger, player.getFoodLevel() + feedAmount))); player.setFoodLevel(Math.min(maxHunger, Math.max(minHunger, player.getFoodLevel() + feedAmount)));
} }
@ -209,6 +211,7 @@ public synchronized PlayerFlagState getState(Player player) {
*/ */
public static class PlayerFlagState { public static class PlayerFlagState {
public long lastHeal; public long lastHeal;
public long lastFeed;
public String lastGreeting; public String lastGreeting;
public String lastFarewell; public String lastFarewell;
public Boolean lastExitAllowed = null; public Boolean lastExitAllowed = null;