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-02-12 13:48:26 +00:00
parent 8a02a8d067
commit 7073c502e9
75 changed files with 299 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0066-Allow-Teleportation-of-Vehicles-and-Passengers.patch
View File

@@ -1,14 +1,14 @@
From 5c69c193f3ea57e986c6c66e306b62b41721448d Mon Sep 17 00:00:00 2001
From 6cf9098868312d0b36d20b135d228292e9fa7ced 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 3c17e2f..4fa4142 100644
index a85b08e..5fe8276 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -430,9 +430,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -431,9 +431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return false;
}
@@ -23,7 +23,7 @@ index 3c17e2f..4fa4142 100644
// From = Players current Location
Location from = this.getLocation();
@@ -446,6 +448,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -447,6 +449,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (event.isCancelled()) {
return false;
}
@@ -36,5 +36,5 @@ index 3c17e2f..4fa4142 100644
// Update the From Location
from = event.getFrom();
--
1.8.3.2
1.8.4.msysgit.0