Upstream merge, lots of conflicts

By: md_5 <git@md-5.net>
2014-06-22 19:25:10 +10:00
parent 07a1436667
commit 9ab31295a9
120 changed files with 252 additions and 349 deletions
--- a/CraftBukkit-Patches/0060-Allow-Teleportation-of-Vehicles-and-Passengers.patch
+++ b/CraftBukkit-Patches/0060-Allow-Teleportation-of-Vehicles-and-Passengers.patch
@@ -0,0 +1,40 @@
+From 2f2e091205757111702bd087de1e26032403a6d2 Mon Sep 17 00:00:00 2001
+From: ItsHarry <info@itsjerryandharry.com>
+Date: Thu, 5 Dec 2013 21:58:11 +0100
+Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 5142f71..7d16bab 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -459,9 +459,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+             return false;
+         }
+ 
+-        if (entity.vehicle != null || entity.passenger != null) {
+-            return false;
+-        }
+        // Spigot Start
+        // if (entity.vehicle != null || entity.passenger != null) {
+        // return false;
+        // }
+        // Spigot End
+ 
+         // From = Players current Location
+         Location from = this.getLocation();
+@@ -475,6 +477,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         if (event.isCancelled()) {
+             return false;
+         }
+        
+        // Spigot Start
+        eject();
+        leaveVehicle();
+        // Spigot End
+ 
+         // Update the From Location
+         from = event.getFrom();
+-- 
+1.9.1
+