mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Revert "Fix for players getting stuck in elevator books/teleporter guis"
This reverts commit f595cb06a8
.
This commit is contained in:
parent
6482f317b2
commit
2506437339
@ -23,6 +23,10 @@ public class Variables {
|
||||
public static List<UUID> blocks = new ArrayList<UUID>();
|
||||
public static List<UUID> cancelPlace = new ArrayList<UUID>();
|
||||
public static Map<UUID, ItemStack> arrows = new HashMap<UUID, ItemStack>();
|
||||
<<<<<<< HEAD
|
||||
public static Map<UUID, String> dialogueCooldown = new HashMap<UUID, String>();
|
||||
=======
|
||||
public static List<UUID> usingGuide = new ArrayList<UUID>();
|
||||
>>>>>>> parent of f595cb0... Fix for players getting stuck in elevator books/teleporter guis
|
||||
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
package me.mrCookieSlime.Slimefun.listeners;
|
||||
|
||||
import me.mrCookieSlime.Slimefun.SlimefunStartup;
|
||||
import me.mrCookieSlime.Slimefun.Variables;
|
||||
import me.mrCookieSlime.Slimefun.GPS.Elevator;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.Teleporter;
|
||||
@ -13,7 +12,6 @@ import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
|
||||
public class TeleporterListener implements Listener {
|
||||
|
||||
@ -40,8 +38,6 @@ public class TeleporterListener implements Listener {
|
||||
}
|
||||
|
||||
try {
|
||||
if(Variables.dialogueCooldown.containsKey(e.getPlayer().getUniqueId())) return;
|
||||
else Variables.dialogueCooldown.put(e.getPlayer().getUniqueId(), e.getClickedBlock().getLocation().toString());
|
||||
((Teleporter) teleporter).onInteract(e.getPlayer(), e.getClickedBlock().getRelative(BlockFace.DOWN));
|
||||
} catch (Exception x) {
|
||||
x.printStackTrace();
|
||||
@ -58,8 +54,6 @@ public class TeleporterListener implements Listener {
|
||||
}
|
||||
|
||||
try {
|
||||
if(Variables.dialogueCooldown.containsKey(e.getPlayer().getUniqueId())) return;
|
||||
else Variables.dialogueCooldown.put(e.getPlayer().getUniqueId(), e.getClickedBlock().getLocation().toString());
|
||||
((Teleporter) teleporter).onInteract(e.getPlayer(), e.getClickedBlock().getRelative(BlockFace.DOWN));
|
||||
} catch (Exception x) {
|
||||
x.printStackTrace();
|
||||
@ -69,18 +63,8 @@ public class TeleporterListener implements Listener {
|
||||
else e.setCancelled(true);
|
||||
}
|
||||
else if (item.getID().equals("ELEVATOR_PLATE")) {
|
||||
if(Variables.dialogueCooldown.containsKey(e.getPlayer().getUniqueId())) return;
|
||||
else Variables.dialogueCooldown.put(e.getPlayer().getUniqueId(), e.getClickedBlock().getLocation().toString());
|
||||
Elevator.openDialogue(e.getPlayer(), e.getClickedBlock());
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerMove(PlayerMoveEvent e) {
|
||||
if(Variables.dialogueCooldown.containsKey(e.getPlayer().getUniqueId())) {
|
||||
if(!e.getPlayer().getLocation().toString().equals(Variables.dialogueCooldown.get(e.getPlayer().getUniqueId()))) {
|
||||
Variables.dialogueCooldown.remove(e.getPlayer().getUniqueId());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user