TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 11:49:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix NPE where players trigger creature spawn

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1052 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
ementalo 2011-03-31 22:20:53 +00:00
parent 6416041d22
commit fb80869961
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
View file

@ -49,8 +49,6 @@ public class EssentialsProtect extends JavaPlugin
blockListener = new EssentialsProtectBlockListener(this); blockListener = new EssentialsProtectBlockListener(this);
entityListener = new EssentialsProtectEntityListener(this); entityListener = new EssentialsProtectEntityListener(this);
pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Low, this); pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Low, this);
// Why is this commented?
//pm.registerEvent(Type.BLOCK_DAMAGED, blockListener, Priority.High, this);
pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Highest, this); pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Highest, this);
pm.registerEvent(Type.BLOCK_FROMTO, blockListener, Priority.Highest, this); pm.registerEvent(Type.BLOCK_FROMTO, blockListener, Priority.Highest, this);
pm.registerEvent(Type.BLOCK_IGNITE, blockListener, Priority.Highest, this); pm.registerEvent(Type.BLOCK_IGNITE, blockListener, Priority.Highest, this);

40
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
View file

@ -10,6 +10,7 @@ import net.minecraft.server.Packet60Explosion;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Creeper; import org.bukkit.entity.Creeper;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
@ -89,7 +90,7 @@ public class EssentialsProtectEntityListener extends EntityListener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (eAttack instanceof Creeper && EssentialsProtect.guardSettings.get("protect.prevent.creeper-playerdamage")) if (eAttack instanceof Creeper && EssentialsProtect.guardSettings.get("protect.prevent.creeper-playerdamage"))
{ {
event.setCancelled(true); event.setCancelled(true);
@ -144,32 +145,36 @@ public class EssentialsProtectEntityListener extends EntityListener
{ {
//Nicccccccccce plaaacccccccccce.. //Nicccccccccce plaaacccccccccce..
int maxHeight = Essentials.getSettings().getEpCreeperMaxHeight(); int maxHeight = Essentials.getSettings().getEpCreeperMaxHeight();
if ( EssentialsProtect.guardSettings.get("protect.prevent.creeper-explosion") || if (EssentialsProtect.guardSettings.get("protect.prevent.creeper-explosion")
EssentialsProtect.guardSettings.get("protect.prevent.creeper-blockdamage") || || EssentialsProtect.guardSettings.get("protect.prevent.creeper-blockdamage")
(maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)) || (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))
{ {
HashSet<ChunkPosition> set = new HashSet<ChunkPosition>(event.blockList().size()); HashSet<ChunkPosition> set = new HashSet<ChunkPosition>(event.blockList().size());
Player[] players = parent.getServer().getOnlinePlayers(); Player[] players = parent.getServer().getOnlinePlayers();
List<ChunkPosition> blocksUnderPlayers = new ArrayList<ChunkPosition>(players.length); List<ChunkPosition> blocksUnderPlayers = new ArrayList<ChunkPosition>(players.length);
Location loc = event.getLocation(); Location loc = event.getLocation();
for (Player player : players) { for (Player player : players)
if (player.getWorld().equals(loc.getWorld())) { {
if (player.getWorld().equals(loc.getWorld()))
{
blocksUnderPlayers.add( blocksUnderPlayers.add(
new ChunkPosition( new ChunkPosition(
player.getLocation().getBlockX(), player.getLocation().getBlockX(),
player.getLocation().getBlockY() - 1, player.getLocation().getBlockY() - 1,
player.getLocation().getBlockZ())); player.getLocation().getBlockZ()));
} }
} }
for (Block block : event.blockList()) { for (Block block : event.blockList())
{
ChunkPosition cp = new ChunkPosition(block.getX(), block.getY(), block.getZ()); ChunkPosition cp = new ChunkPosition(block.getX(), block.getY(), block.getZ());
if (!blocksUnderPlayers.contains(cp)) { if (!blocksUnderPlayers.contains(cp))
{
set.add(cp); set.add(cp);
} }
} }
((CraftServer)parent.getServer()).getServer().f.a(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftServer)parent.getServer()).getServer().f.a(loc.getX(), loc.getY(), loc.getZ(), 64.0D,
new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set)); new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -185,12 +190,17 @@ public class EssentialsProtectEntityListener extends EntityListener
} }
@Override @Override
public void onCreatureSpawn(CreatureSpawnEvent event) { public void onCreatureSpawn(CreatureSpawnEvent event)
{
if (event.getEntity() instanceof CraftPlayer) return;
if (event.isCancelled()) return;
String creatureName = event.getCreatureType().toString().toLowerCase(); String creatureName = event.getCreatureType().toString().toLowerCase();
if (creatureName == null || creatureName.isEmpty()) { if (creatureName == null || creatureName.isEmpty())
{
return; return;
} }
if (EssentialsProtect.guardSettings.get("protect.prevent.spawn."+creatureName)) { if (EssentialsProtect.guardSettings.get("protect.prevent.spawn." + creatureName))
{
event.setCancelled(true); event.setCancelled(true);
} }
} }