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

Update upstream B/CB/S

Browse Source 
Also fixes build as a result of an upstream force push

--- work/Bukkit
Submodule work/Bukkit 217dc08d..d13fdf8c:
  > SPIGOT-4637: Add source block to BlockPhysicsEvent.

--- work/CraftBukkit
Submodule work/CraftBukkit acbba8ba..cb98c6ea:
  > Fix line endings in CraftDefaultPermissions
  > SPIGOT-4637: Add source block to BlockPhysicsEvent.

--- work/Spigot
Submodule work/Spigot 75ee78a0c...4165cd8f4 (commits not present)
  > (Manually Added) - Appears to be a result of an upstream force push
  > (Manually Added) - Changed: SPIGOT-4636: Add creative mode NBT permissions
This commit is contained in:
Zach Brown
2019-02-25 04:39:24 -05:00
parent a76df3ca91
commit 80620a2861
72 changed files with 198 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Here-s-Johnny.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Here's Johnny!
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
index 96d0651e9b..4bbb4817b1 100644
index 96d0651e9..4bbb4817b 100644
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ index 96d0651e9b..4bbb4817b1 100644
return entity instanceof EntityLiving && ((EntityLiving) entity).df();
};
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
index 951d479298..5ff957ced7 100644
index 951d47929..5ff957ced 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
@@ -0,0 +0,0 @@ public class CraftVindicator extends CraftIllager implements Vindicator {