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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-03 21:12:44 +01:00
parent b07d19630a
commit fbf54955d5
25 changed files with 100 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0064-Allow-Teleportation-of-Vehicles-and-Passengers.patch
View File

@@ -1,14 +1,14 @@
From efbd966c4bfc85a6f8444b284def2f23583f5d71 Mon Sep 17 00:00:00 2001
From 015c23123158d752c654b696b44c42bb32cf514d 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 8b6e210..a2638bc 100644
index 9bc708e..76e5643 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -431,9 +431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -453,9 +453,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return false;
}
@@ -23,7 +23,7 @@ index 8b6e210..a2638bc 100644
// From = Players current Location
Location from = this.getLocation();
@@ -447,6 +449,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -469,6 +471,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (event.isCancelled()) {
return false;
}