Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 13:36:16 +01:00
Code Issues Projects Releases Wiki Activity

Fixed cancelled lighting strikes dealing damage.

Browse Source
This commit is contained in:
EvilSeph 2011-06-10 20:37:33 -04:00
parent fb3e3ade90
commit cd12f057a7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minecraft/server/WorldServer.java
View File

@ -130,7 +130,6 @@ public class WorldServer extends World implements BlockChangeDelegate {
} }
public boolean a(Entity entity) { public boolean a(Entity entity) {
if (super.a(entity)) {
// CraftBukkit start // CraftBukkit start
LightningStrikeEvent lightning = new LightningStrikeEvent((org.bukkit.World) world, (org.bukkit.entity.LightningStrike) entity.getBukkitEntity()); LightningStrikeEvent lightning = new LightningStrikeEvent((org.bukkit.World) world, (org.bukkit.entity.LightningStrike) entity.getBukkitEntity());
this.cserver.getPluginManager().callEvent(lightning); this.cserver.getPluginManager().callEvent(lightning);
@ -138,6 +137,8 @@ public class WorldServer extends World implements BlockChangeDelegate {
if (lightning.isCancelled()) { if (lightning.isCancelled()) {
return false; return false;
} }
if (super.a(entity)) {
this.server.serverConfigurationManager.a(entity.locX, entity.locY, entity.locZ, 512.0D, this.dimension, new Packet71Weather(entity)); this.server.serverConfigurationManager.a(entity.locX, entity.locY, entity.locZ, 512.0D, this.dimension, new Packet71Weather(entity));
// CraftBukkit end // CraftBukkit end
return true; return true;