Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-02 00:27:31 +02:00
Code Issues Projects Releases Wiki Activity

Cleaned code in IslandRespawnListener (#587)

Browse Source 
1. Made respawn map private and final.
2. Changed value type from World to UUID. (weaker reference)
3. Removed ignoreCancelled from both listener annotations. (neither events can even be cancelled)
4. Changed program flow from "if-so-continue" to "if-not-return". (easier to follow and read)
5. Added basic comments on what each check does.
6. Removed redundant flag check. (wouldn't be in the map if it wasn't true)
7. Removed redundant Map contains, get, and then remove calls. (A simple call to remove and a null check are more efficient)
This commit is contained in:
Ranald 2019-03-02 16:47:52 -05:00 committed by Florian CUNY
parent ae28531327
commit 7c01199763
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListener.java
View File

@ -22,33 +22,47 @@ import world.bentobox.bentobox.lists.Flags;
*/
public class IslandRespawnListener extends FlagListener {
Map<UUID, World> respawn = new HashMap<>();
private final Map<UUID, UUID> respawn = new HashMap<>();
/**
* Tag players who die in island space and have an island
* @param e - event
*/
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
@EventHandler(priority = EventPriority.LOW)
public void onPlayerDeath(PlayerDeathEvent e) {
if (getIWM().inWorld(e.getEntity().getLocation()) && Flags.ISLAND_RESPAWN.isSetForWorld(e.getEntity().getWorld())
&& getIslands().hasIsland(e.getEntity().getWorld(), e.getEntity().getUniqueId())) {
respawn.put(e.getEntity().getUniqueId(), e.getEntity().getWorld());
if (!getIWM().inWorld(e.getEntity().getLocation())) {
return; // not in the island world
}
if (!Flags.ISLAND_RESPAWN.isSetForWorld(e.getEntity().getWorld())) {
return; // world doesn't have the island respawn flag
}
if (!getIslands().hasIsland(e.getEntity().getWorld(), e.getEntity().getUniqueId())) {
return; // doesn't have an island in this world
}
respawn.put(e.getEntity().getUniqueId(), e.getEntity().getWorld().getUID());
}
/**
* Place players back on their island if respawn on island is true and active
* @param e - event
*/
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerRespawn(PlayerRespawnEvent e) {
if (Flags.ISLAND_RESPAWN.isSetForWorld(e.getPlayer().getWorld()) && respawn.containsKey(e.getPlayer().getUniqueId())) {
World world = respawn.get(e.getPlayer().getUniqueId());
respawn.remove(e.getPlayer().getUniqueId());
Location respawnLocation = getIslands().getSafeHomeLocation(world, User.getInstance(e.getPlayer().getUniqueId()), 1);
if (respawnLocation != null) {
e.setRespawnLocation(respawnLocation);
}
final UUID worldUUID = respawn.remove(e.getPlayer().getUniqueId());
if (worldUUID == null) {
return; // no respawn world set
}
final World world = e.getPlayer().getServer().getWorld(worldUUID);
if (world == null) {
return; // world no longer available
}
final Location respawnLocation = getIslands().getSafeHomeLocation(world, User.getInstance(e.getPlayer().getUniqueId()), 1);
if (respawnLocation != null) {
e.setRespawnLocation(respawnLocation);
}
}
}