OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 04:02:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Call EntityChangeBlockEvent when boats destroy blocks. Fixes BUKKIT-3871

Browse source
This commit is contained in:
Black-Hole 2013-03-23 16:10:14 +01:00 committed by GJ
parent 18d7bc7ca3
commit 02a5d09ddf
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/net/minecraft/server/EntityBoat.java
View file

@ -4,6 +4,7 @@ import java.util.List;
// CraftBukkit start // CraftBukkit start
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.entity.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.event.vehicle.VehicleDamageEvent;
import org.bukkit.event.vehicle.VehicleDestroyEvent; import org.bukkit.event.vehicle.VehicleDestroyEvent;
@ -379,8 +380,20 @@ public class EntityBoat extends Entity {
int i2 = this.world.getTypeId(i1, l1, j1); int i2 = this.world.getTypeId(i1, l1, j1);
if (i2 == Block.SNOW.id) { if (i2 == Block.SNOW.id) {
// CraftBukkit start
if (CraftEventFactory.callEntityChangeBlockEvent(this, i1, l1, j1, 0, 0).isCancelled()) {
continue;
}
// CraftBukkit end
this.world.setAir(i1, l1, j1); this.world.setAir(i1, l1, j1);
} else if (i2 == Block.WATER_LILY.id) { } else if (i2 == Block.WATER_LILY.id) {
// CraftBukkit start
if (CraftEventFactory.callEntityChangeBlockEvent(this, i1, l1, j1, 0, 0).isCancelled()) {
continue;
}
// CraftBukkit end
this.world.setAir(i1, l1, j1, true); this.world.setAir(i1, l1, j1, true);
} }
} }