Merge pull request DevotedMC#30 from Lazersmoke/fixprisonsteal

Fix pearl stealing in the End
Maxopoly · Feb 28, 2018 · 3290782 · 3290782
2 parents ad4c2b6 + 50d6546
commit 3290782
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/java/com/devotedmc/ExilePearl/listener/PlayerListener.java b/src/main/java/com/devotedmc/ExilePearl/listener/PlayerListener.java
@@ -536,6 +536,13 @@ public void onEntityDeath(EntityDeathEvent e) {
 		} else {
 			playerId = ((Player)e.getEntity()).getUniqueId();
 		}
+
+		if(pearlApi.isPlayerExiled(playerId)
+		   && pearlApi.getPearl(playerId).getPearlType() == PearlType.PRISON
+		   && !pearlApi.getPearl(playerId).isSummoned()
+		   && e.getEntity().getLocation().getWorld().equals(pearlApi.getPearlConfig().getPrisonWorld())){
+			return;
+		}
 
 		// These will be priority sorted according to the configured algorithm
 		List<Player> damagers = pearlApi.getDamageLogger().getSortedDamagers(playerId);