Update upstream B/CB/S

2017-05-15 11:25:20 -05:00 · 2017-05-15 11:25:20 -05:00 · f7d8aa4188
commit f7d8aa4188
parent b75e22ccb2
26 changed files with 61 additions and 58 deletions
--- a/Spigot-API-Patches/Entity-Origin-API.patch
+++ b/Spigot-API-Patches/Entity-Origin-API.patch
@ -5,13 +5,13 @@ 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 69bdb460..c0b7426d 100644
+index 0144bef9..fbff9860 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
- 
+     @Override
     Spigot spigot();
-     // Spigot End
+     // Spigot end
 +
 +    // Paper start
 +    /**