Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-23 11:15:24 +01:00
Code Issues Projects Releases Wiki Activity

Switch to use Util method to reset player health.

Browse Source 
Reduces duplicate code.
This commit is contained in:
tastybento 2020-10-11 09:18:53 -07:00
parent ae1db70ff6
commit b024d0cc8b
7 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java
View File

@ -100,7 +100,7 @@ public class AdminDeleteCommand extends ConfirmableCommand {
} }
// Reset the health // Reset the health
if (getIWM().isOnLeaveResetHealth(getWorld())) { if (getIWM().isOnLeaveResetHealth(getWorld())) {
target.getPlayer().setHealth(20.0D); Util.resetHealth(target.getPlayer());
} }
// Reset the hunger // Reset the hunger

4
src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java
View File

@ -126,7 +126,7 @@ public class IslandResetCommand extends ConfirmableCommand {
.oldIsland(oldIsland) .oldIsland(oldIsland)
.location(oldIsland.getCenter()) .location(oldIsland.getCenter())
.build(); .build();
// Reset the island // Reset the island
user.sendMessage("commands.island.create.creating-island"); user.sendMessage("commands.island.create.creating-island");
@ -205,7 +205,7 @@ public class IslandResetCommand extends ConfirmableCommand {
// Reset the health // Reset the health
if (getIWM().isOnLeaveResetHealth(getWorld())) { if (getIWM().isOnLeaveResetHealth(getWorld())) {
member.getPlayer().setHealth(20.0D); Util.resetHealth(member.getPlayer());
} }
// Reset the hunger // Reset the hunger

6
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
View File

@ -3,8 +3,6 @@ package world.bentobox.bentobox.api.commands.island.team;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.bukkit.attribute.Attribute;
import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.commands.ConfirmableCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand;
import world.bentobox.bentobox.api.commands.island.team.Invite.Type; import world.bentobox.bentobox.api.commands.island.team.Invite.Type;
@ -14,6 +12,7 @@ import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.managers.RanksManager;
import world.bentobox.bentobox.util.Util;
/** /**
* @author tastybento * @author tastybento
@ -197,8 +196,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
// Reset the health // Reset the health
if (getIWM().isOnJoinResetHealth(getWorld())) { if (getIWM().isOnJoinResetHealth(getWorld())) {
double maxHealth = user.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue(); Util.resetHealth(user.getPlayer());
user.getPlayer().setHealth(maxHealth);
} }
// Reset the hunger // Reset the hunger

2
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java
View File

@ -110,7 +110,7 @@ public class IslandTeamKickCommand extends ConfirmableCommand {
} }
// Reset the health // Reset the health
if (getIWM().isOnLeaveResetHealth(getWorld())) { if (getIWM().isOnLeaveResetHealth(getWorld())) {
target.getPlayer().setHealth(20.0D); Util.resetHealth(target.getPlayer());
} }
// Reset the hunger // Reset the hunger

14
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java
View File

@ -86,7 +86,7 @@ public class IslandTeamLeaveCommand extends ConfirmableCommand {
} }
// Reset the health // Reset the health
if (getIWM().isOnLeaveResetHealth(getWorld())) { if (getIWM().isOnLeaveResetHealth(getWorld())) {
user.getPlayer().setHealth(20.0D); Util.resetHealth(user.getPlayer());
} }
// Reset the hunger // Reset the hunger
@ -118,11 +118,11 @@ public class IslandTeamLeaveCommand extends ConfirmableCommand {
.involvedPlayer(user.getUniqueId()) .involvedPlayer(user.getUniqueId())
.build(); .build();
IslandEvent.builder() IslandEvent.builder()
.island(island) .island(island)
.involvedPlayer(user.getUniqueId()) .involvedPlayer(user.getUniqueId())
.admin(false) .admin(false)
.reason(IslandEvent.Reason.RANK_CHANGE) .reason(IslandEvent.Reason.RANK_CHANGE)
.rankChange(island.getRank(user), RanksManager.VISITOR_RANK) .rankChange(island.getRank(user), RanksManager.VISITOR_RANK)
.build(); .build();
} }
} }

3
src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
View File

@ -22,7 +22,6 @@ import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.TreeSpecies; import org.bukkit.TreeSpecies;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.attribute.Attribute;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.entity.Boat; import org.bukkit.entity.Boat;
@ -924,7 +923,7 @@ public class IslandsManager {
// Reset the health // Reset the health
if (plugin.getIWM().isOnJoinResetHealth(world)) { if (plugin.getIWM().isOnJoinResetHealth(world)) {
user.getPlayer().setHealth(user.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue()); Util.resetHealth(user.getPlayer());
} }
// Reset the hunger // Reset the hunger

14
src/main/java/world/bentobox/bentobox/util/Util.java
View File

@ -19,6 +19,7 @@ import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.attribute.Attribute;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.entity.Animals; import org.bukkit.entity.Animals;
@ -279,7 +280,7 @@ public class Util {
return 90F; return 90F;
case EAST_NORTH_EAST: case EAST_NORTH_EAST:
return 67.5F; return 67.5F;
case NORTH_EAST: case NORTH_EAST:
return 45F; return 45F;
case NORTH_NORTH_EAST: case NORTH_NORTH_EAST:
return 22.5F; return 22.5F;
@ -644,6 +645,15 @@ public class Util {
} }
} }
}); });
}
/**
* Resets the player's heath to maximum
* @param player - player
*/
public static void resetHealth(Player player) {
double maxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue();
player.setHealth(maxHealth);
} }
} }