Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-08 11:59:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix for minecart naming

Browse Source
This commit is contained in:
wizjany 2013-03-16 12:15:35 -04:00
parent f67ad6478c
commit 92bb3948a6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -36,7 +36,6 @@
import org.bukkit.entity.Fireball; import org.bukkit.entity.Fireball;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.entity.MinecartTNT;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
@ -91,6 +90,8 @@ public class WorldGuardEntityListener implements Listener {
private WorldGuardPlugin plugin; private WorldGuardPlugin plugin;
private EntityType tntMinecartType;
/** /**
* Construct the object; * Construct the object;
* *
@ -98,6 +99,7 @@ public class WorldGuardEntityListener implements Listener {
*/ */
public WorldGuardEntityListener(WorldGuardPlugin plugin) { public WorldGuardEntityListener(WorldGuardPlugin plugin) {
this.plugin = plugin; this.plugin = plugin;
tntMinecartType = BukkitUtil.tryEnum(EntityType.class, "MINECART_TNT");
} }
/** /**
@ -274,7 +276,7 @@ private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
} }
} }
if (attacker instanceof TNTPrimed || attacker instanceof MinecartTNT) { if (attacker instanceof TNTPrimed || attacker.getType() == tntMinecartType) {
// The check for explosion damage should be handled already... But... What ever... // The check for explosion damage should be handled already... But... What ever...
if (wcfg.blockTNTExplosions) { if (wcfg.blockTNTExplosions) {
@ -600,7 +602,7 @@ public void onEntityExplode(EntityExplodeEvent event) {
} }
} }
} }
} else if (ent instanceof TNTPrimed || ent instanceof MinecartTNT) { } else if (ent instanceof TNTPrimed || (ent != null && ent.getType() == tntMinecartType)) {
if (wcfg.blockTNTBlockDamage) { if (wcfg.blockTNTBlockDamage) {
event.blockList().clear(); event.blockList().clear();
return; return;
@ -731,7 +733,8 @@ public void onExplosionPrime(ExplosionPrimeEvent event) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
} else if (event.getEntityType() == EntityType.PRIMED_TNT) { } else if (event.getEntityType() == EntityType.PRIMED_TNT
|| event.getEntityType() == tntMinecartType) {
if (wcfg.blockTNTExplosions) { if (wcfg.blockTNTExplosions) {
event.setCancelled(true); event.setCancelled(true);
return; return;