summaryrefslogtreewikicommitdiff
diff options
context:
space:
mode:
authorTyler Murphy <tylermurphy534@gmail.com>2021-12-30 12:04:47 -0500
committerTyler Murphy <tylermurphy534@gmail.com>2021-12-30 12:04:47 -0500
commit70de5e9970674cbaff2acd2a1929c8faf16a4692 (patch)
treeca43ffa540d9629f6f0faf2ab3d5e5941db0f352
parent1.3.3 rc4 (diff)
downloadkenshinshideandseek-70de5e9970674cbaff2acd2a1929c8faf16a4692.tar.gz
kenshinshideandseek-70de5e9970674cbaff2acd2a1929c8faf16a4692.tar.bz2
kenshinshideandseek-70de5e9970674cbaff2acd2a1929c8faf16a4692.zip
1.3.3 rc5
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java5
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/game/Game.java2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
index 474d3be..42589bc 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
@@ -120,7 +120,7 @@ public class EventListener implements Listener {
}
}
- Map<UUID, Location> temp_loc = new HashMap<>();
+ public static final Map<UUID, Location> temp_loc = new HashMap<>();
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerDeath(PlayerDeathEvent event){
@@ -138,6 +138,7 @@ public class EventListener implements Listener {
if(!Board.isPlayer(player)) return;
if(temp_loc.containsKey(player.getUniqueId())){
player.teleport(temp_loc.get(player.getUniqueId()));
+ temp_loc.remove(player.getUniqueId());
}
}
@@ -260,4 +261,4 @@ public class EventListener implements Listener {
}
}
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index a51b86e..225eab0 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -42,6 +42,7 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
+import java.beans.EventHandler;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
@@ -156,6 +157,7 @@ public class Game {
Packet.setGlow(player, temp, false);
}
}
+ EventListener.temp_loc.clear();
worldLoader.unloadMap();
Board.reloadLobbyBoards();
}