Stage 1.5

By: md_5 <git@md-5.net>
2014-04-12 14:18:50 +10:00
parent 28ccca81f4
commit c47da724d4
95 changed files with 0 additions and 5608 deletions
--- a/CraftBukkit-Patches/0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch
+++ b/CraftBukkit-Patches/0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch
@@ -1,40 +0,0 @@
-From ef522cef52d46863be10da19322970154d9075ea 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 03d6d36..b14098a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -453,9 +453,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();
-@@ -469,6 +471,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.8.5.2.msysgit.0
-