diff options
| author | Zach Brown <[email protected]> | 2016-11-12 20:21:46 -0600 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2016-11-12 20:21:46 -0600 |
| commit | 65538782cde89c70de3e55f5945b20c342a58726 (patch) | |
| tree | ef9a38a2367f30e205d3f957e1026f95c71c0167 | |
| parent | 3456f7017b19af5074fb733408697606be711b0b (diff) | |
| download | Paper-65538782cde89c70de3e55f5945b20c342a58726.tar.gz Paper-65538782cde89c70de3e55f5945b20c342a58726.zip | |
Update upstream B/CB/S
| -rw-r--r-- | Spigot-API-Patches/0007-Entity-Origin-API.patch | 8 | ||||
| -rw-r--r-- | Spigot-Server-Patches/0025-Entity-Origin-API.patch | 8 | ||||
| m--------- | work/Bukkit | 0 | ||||
| m--------- | work/CraftBukkit | 10 | ||||
| m--------- | work/Spigot | 0 |
5 files changed, 13 insertions, 13 deletions
diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index 8c2fc39821..0a26940e03 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,14 +1,14 @@ -From 542ce731cfb33acb2fce81a466b20e2e121ab269 Mon Sep 17 00:00:00 2001 +From 9bfa695b5dc689ed703dd12078257d3411799997 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Mon, 29 Feb 2016 17:50:31 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index cbcc835..27b429e 100644 +index 5c64b79..23524b8 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -435,4 +435,15 @@ public interface Entity extends Metadatable, CommandSender { +@@ -463,4 +463,15 @@ public interface Entity extends Metadatable, CommandSender { Spigot spigot(); // Spigot End @@ -61,5 +61,5 @@ index 3ce322d..69df487 100644 + public org.bukkit.Location getSourceLoc(); } -- -2.10.0.windows.1 +2.10.2 diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index 02afe8f7f3..356e7cbe19 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From 4bb47c60de037d0bcb5a0714eb4ebe20d1e52f1b Mon Sep 17 00:00:00 2001 +From 3febea393a161f09bef588e1b62c721860f1b0ec Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API @@ -106,10 +106,10 @@ index e3d971c..5b3e50c 100644 flag = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index b35f713..c8435a3 100644 +index 09523de..a24efd9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -635,4 +635,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -650,4 +650,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return spigot; } // Spigot end @@ -155,5 +155,5 @@ index c493c9c..93843aa 100644 + // Paper end } -- -2.10.1.windows.1 +2.10.2 diff --git a/work/Bukkit b/work/Bukkit -Subproject b80e520acb9f3e5a14a92a06c08c470290b323c +Subproject 570e0e67528698b67770ea12e22c82d937fd308 diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject 33071ecfffad01854afcf4e05b8e58e4e9fe723 +Subproject 51263e97187a84338f89698eef187284055a682 diff --git a/work/Spigot b/work/Spigot -Subproject 72c26058df3d4c3a8d2e2b3255d3a032623a01f +Subproject de459a282d9f494bbc5588b461b3e8eacd74f74 |