Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-28 12:56:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/breaking' into breaking

Browse Source
This commit is contained in:
MattBDev 2019-09-06 20:40:38 -04:00
commit f7b78595a9
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 SPECTRAL_ARROW:
case SPLASH_POTION: case SPLASH_POTION:
case THROWN_EXP_BOTTLE: case THROWN_EXP_BOTTLE:
case TRIDENT:
// projectile // projectile
case FALLING_BLOCK: case FALLING_BLOCK:
case PRIMED_TNT: case PRIMED_TNT:
@ -181,7 +180,6 @@ import java.util.regex.Pattern;
case VILLAGER: case VILLAGER:
case WOLF: case WOLF:
case ZOMBIE_HORSE: case ZOMBIE_HORSE:
case WANDERING_TRADER:
// animal // animal
return EntityUtil return EntityUtil
.checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP); .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
@ -2164,16 +2162,8 @@ import java.util.regex.Pattern;
} }
break; break;
case REINFORCEMENTS: case REINFORCEMENTS:
case VILLAGE_DEFENSE:
case VILLAGE_INVASION:
case NATURAL: case NATURAL:
case CHUNK_GEN: case CHUNK_GEN:
case SILVERFISH_BLOCK:
case ENDER_PEARL:
case DROWNED:
case CURED:
case DEFAULT:
case LIGHTNING:
if (!area.MOB_SPAWNING) { if (!area.MOB_SPAWNING) {
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -2278,7 +2268,16 @@ import java.util.regex.Pattern;
Entity ignitingEntity = event.getIgnitingEntity(); Entity ignitingEntity = event.getIgnitingEntity();
Block block = event.getBlock(); Block block = event.getBlock();
BlockIgniteEvent.IgniteCause igniteCause = event.getCause(); 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(); PlotArea area = location1.getPlotArea();
if (area == null) { if (area == null) {
return; return;