Update from upstream SpigotMC

Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
This commit is contained in:
Zach Brown
2014-08-18 10:43:17 -05:00
parent 706fab83cd
commit b742f7a892
122 changed files with 7 additions and 125 deletions

View File

@@ -47,18 +47,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (event.isCancelled()) {
return false;
}
-
+
+ // PaperSpigot start
// Spigot Start
- eject();
- leaveVehicle();
+ //eject();
+ //leaveVehicle();
// Spigot End
// If this player is riding another entity, we must dismount before teleporting.
entity.mount(null);
+ // PaperSpigot start
+ Entity vehicle = entity.vehicle;