Skip to content

Commit 6590207

Browse files
committed
Don't allow player to die while waiting for data
Also remove deprecated PlayerPickupItemEvent usage
1 parent 94b8de3 commit 6590207

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

src/main/java/de/minebench/syncinv/listeners/PlayerFreezeListener.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import org.bukkit.event.block.BlockDamageEvent;
99
import org.bukkit.event.entity.EntityDamageByEntityEvent;
1010
import org.bukkit.event.entity.EntityDamageEvent;
11+
import org.bukkit.event.entity.EntityPickupItemEvent;
12+
import org.bukkit.event.entity.PlayerDeathEvent;
1113
import org.bukkit.event.inventory.InventoryClickEvent;
1214
import org.bukkit.event.inventory.InventoryDragEvent;
1315
import org.bukkit.event.inventory.InventoryOpenEvent;
@@ -17,7 +19,6 @@
1719
import org.bukkit.event.player.PlayerExpChangeEvent;
1820
import org.bukkit.event.player.PlayerInteractEvent;
1921
import org.bukkit.event.player.PlayerMoveEvent;
20-
import org.bukkit.event.player.PlayerPickupItemEvent;
2122

2223
/*
2324
* SyncInv
@@ -69,10 +70,10 @@ private boolean sameBlock(Location from, Location to) {
6970
}
7071

7172
@EventHandler(ignoreCancelled = true)
72-
public void onPlayerPickupItem(PlayerPickupItemEvent e) {
73-
if(plugin.isLocked(e.getPlayer().getUniqueId())) {
73+
public void onPlayerPickupItem(EntityPickupItemEvent e) {
74+
if (e.getEntity() instanceof Player && plugin.isLocked(e.getEntity().getUniqueId())) {
7475
e.setCancelled(true);
75-
e.getPlayer().sendMessage(plugin.getLang("cant-pickup-items"));
76+
e.getEntity().sendMessage(plugin.getLang("cant-pickup-items"));
7677
}
7778
}
7879

@@ -91,6 +92,13 @@ public void onPlayerDamage(EntityDamageEvent e) {
9192
}
9293
}
9394

95+
@EventHandler(ignoreCancelled = true)
96+
public void onPlayerDeath(PlayerDeathEvent e) {
97+
if (plugin.isLocked(e.getPlayer().getUniqueId())) {
98+
e.setCancelled(true);
99+
}
100+
}
101+
94102
@EventHandler(ignoreCancelled = true)
95103
public void onInventoryInteraction(InventoryClickEvent e) {
96104
if(plugin.isLocked(e.getWhoClicked().getUniqueId())) {

0 commit comments

Comments
 (0)