TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Add new switch conditions to entity listeners"

Browse source 
This reverts commit a0d666ae14.
It seems to break armor stand placing in some cases.
This commit is contained in:
NotMyFault 2019-09-03 23:56:08 +02:00
parent a7012814ab
commit 40e3b7fa06
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
View file

@ -118,7 +118,6 @@ import java.util.regex.Pattern;
case SPECTRAL_ARROW:
case SPLASH_POTION:
case THROWN_EXP_BOTTLE:
case TRIDENT:
// projectile
case FALLING_BLOCK:
case PRIMED_TNT:
@ -181,7 +180,6 @@ import java.util.regex.Pattern;
case VILLAGER:
case WOLF:
case ZOMBIE_HORSE:
case WANDERING_TRADER:
// animal
return EntityUtil
.checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
@ -2164,16 +2162,8 @@ import java.util.regex.Pattern;
}
break;
case REINFORCEMENTS:
case VILLAGE_DEFENSE:
case VILLAGE_INVASION:
case NATURAL:
case CHUNK_GEN:
case SILVERFISH_BLOCK:
case ENDER_PEARL:
case DROWNED:
case CURED:
case DEFAULT:
case LIGHTNING:
if (!area.MOB_SPAWNING) {
event.setCancelled(true);
return;
@ -2278,7 +2268,16 @@ import java.util.regex.Pattern;
Entity ignitingEntity = event.getIgnitingEntity();
Block block = event.getBlock();
BlockIgniteEvent.IgniteCause igniteCause = event.getCause();
Location location1 = BukkitUtil.getLocation(block.getLocation());
Location location1;
if (block != null) {
location1 = BukkitUtil.getLocation(block.getLocation());
} else if (ignitingEntity != null) {
location1 = BukkitUtil.getLocation(ignitingEntity);
} else if (player != null) {
location1 = BukkitUtil.getLocation(player);
} else {
return;
}
PlotArea area = location1.getPlotArea();
if (area == null) {
return;