Update to Minecraft 1.12-pre2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-14 12:00:00 +10:00
parent b8446f770b
commit 40c8954e17
210 changed files with 2280 additions and 1974 deletions

View File

@@ -15,7 +15,7 @@
@@ -111,6 +117,26 @@
if (this.exitPortal != null) {
BlockPosition blockposition = this.exactTeleport ? this.exitPortal : this.i();
BlockPosition blockposition = this.exactTeleport ? this.exitPortal : this.j();
+ // CraftBukkit start - Fire PlayerTeleportEvent
+ if (entity instanceof EntityPlayer) {
@@ -31,7 +31,7 @@
+ }
+
+ ((EntityPlayer) entity).playerConnection.teleport(teleEvent.getTo());
+ this.i();
+ this.h(); // CraftBukkit - call at end of method
+ return;
+
+ }