Skip to content

Commit 678bf20

Browse files
committed
Update DeathListener.java
1 parent bd96d5a commit 678bf20

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/java/sawfowl/regionguard/listeners/DeathListener.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.spongepowered.api.data.Keys;
99
import org.spongepowered.api.entity.living.player.server.ServerPlayer;
1010
import org.spongepowered.api.event.Listener;
11+
import org.spongepowered.api.event.Order;
1112
import org.spongepowered.api.event.entity.DestructEntityEvent;
1213
import org.spongepowered.api.event.entity.living.player.RespawnPlayerEvent;
1314
import org.spongepowered.api.item.inventory.ItemStack;
@@ -29,9 +30,9 @@ public DeathListener(RegionGuard plugin) {
2930
//cause = Cause.of(EventContext.builder().add(EventContextKeys.PLUGIN, plugin.getPluginContainer()).build(), plugin.getPluginContainer());
3031
}
3132

32-
@Listener
33+
@Listener(order = Order.LAST)
3334
public void onDeath(DestructEntityEvent.Death event) {
34-
if(!(event.entity() instanceof ServerPlayer)) return;
35+
if(event.keepInventory() || !(event.entity() instanceof ServerPlayer)) return;
3536
ServerPlayer player = (ServerPlayer) event.entity();
3637
Region region = plugin.getAPI().findRegion(player.world(), player.blockPosition());
3738
boolean keepInventory = isKeepInventory(region);

0 commit comments

Comments
 (0)