diff options
| author | Zach Brown <[email protected]> | 2016-10-01 11:47:56 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2016-10-01 11:47:56 -0500 |
| commit | 18799efd0d7c05fde4ec562db58c7ec6b5f58c01 (patch) | |
| tree | 9209d84641b0e694d1ac785c329724c659af605f | |
| parent | 9e6cbc520392de265a8280c966024e58573c7275 (diff) | |
| download | Paper-18799efd0d7c05fde4ec562db58c7ec6b5f58c01.tar.gz Paper-18799efd0d7c05fde4ec562db58c7ec6b5f58c01.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 | 6 | ||||
| m--------- | work/Bukkit | 0 | ||||
| m--------- | work/CraftBukkit | 10 | ||||
| m--------- | work/Spigot | 0 |
5 files changed, 12 insertions, 12 deletions
diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index 710c8655a3..8c2fc39821 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,14 +1,14 @@ -From 3ce5b4bd388da96e7866319ee200652797a3b74b Mon Sep 17 00:00:00 2001 +From 542ce731cfb33acb2fce81a466b20e2e121ab269 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 aa7cc17..434334a 100644 +index cbcc835..27b429e 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -421,4 +421,15 @@ public interface Entity extends Metadatable, CommandSender { +@@ -435,4 +435,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.8.3 +2.10.0.windows.1 diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index 88aa186d65..84badf812e 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From ed3cf379c0f5d770f5cf271899c9e6e86803d915 Mon Sep 17 00:00:00 2001 +From e11d76d146840a3175c0ed3bd4214367883b0079 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 fd3b39c..6f6b90b 100644 +index b35f713..c8435a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -625,4 +625,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -635,4 +635,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return spigot; } // Spigot end diff --git a/work/Bukkit b/work/Bukkit -Subproject 9d85e3f475303d7f5bfe8e8b5dee1bd8509ec83 +Subproject 450225fe17a930d7bb0de2d646c4a892d5bdcd7 diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject c1b529eddc72b313fcc81c9d55b6b06200d4bec +Subproject ae93d4fb492bc737466666087dcd49c9f775e40 diff --git a/work/Spigot b/work/Spigot -Subproject 570526c2b4840753183aa81995ea81008238eeb +Subproject 047f737bbf62d3a396c317a58fd9b4034603ee0 |