EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 18:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v5' into backups

Browse Source 
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/configuration/Captions.java
This commit is contained in:
Alexander Söderberg
2020-05-11 20:15:48 +02:00
parent d40160d205 8944be5319
commit e20319f4e1
6 changed files with 117 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
View File

@ -2993,7 +2993,6 @@ public class PlayerEvents extends PlotListener implements Listener {
}
}
@EventHandler public void onDeath(final PlayerDeathEvent event) {
final Plot plot = BukkitUtil.getPlayer(event.getEntity()).getCurrentPlot();
if (plot != null && plot.getFlag(KeepInventoryFlag.class)) {