SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-694: Fix a mis-placed diff causing the event to fire too early

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-04-13 11:55:00 +01:00
parent 3b1579527f
commit 759c72f0aa
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
paper-server/nms-patches/EntityMinecartAbstract.patch
View File

@@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/EntityMinecartAbstract.java 2015-02-26 22:40:22.623608139 +0000
+++ src/main/java/net/minecraft/server/EntityMinecartAbstract.java 2015-02-26 22:40:22.623608139 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/EntityMinecartAbstract.java 2015-04-13 11:54:43.295977016 +0100
+++ src/main/java/net/minecraft/server/EntityMinecartAbstract.java 2015-04-13 11:54:43.295977016 +0100
@@ -4,6 +4,15 @@
import java.util.Iterator;
import java.util.Map;
@@ -16,7 +16,7 @@
public abstract class EntityMinecartAbstract extends Entity implements INamableTileEntity {
private boolean a;
@@ -16,10 +25,23 @@
@@ -16,6 +25,17 @@
private double h;
private double i;
@@ -34,12 +34,15 @@
public EntityMinecartAbstract(World world) {
super(world);
this.k = true;
this.setSize(0.98F, 0.7F);
@@ -81,6 +101,8 @@
this.lastX = d0;
this.lastY = d1;
this.lastZ = d2;
+
+ this.world.getServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleCreateEvent((Vehicle) this.getBukkitEntity())); // CraftBukkit
}
public static EntityMinecartAbstract a(World world, double d0, double d1, double d2, EntityMinecartAbstract.EnumMinecartType entityminecartabstract_enumminecarttype) {
public double an() {
@@ -92,6 +114,19 @@
if (this.isInvulnerable(damagesource)) {
return false;