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

Update upstream B/CB

Browse Source 
Merges fixes for SPIGOT-2404 and SPIGOT-2408 into Paper
This commit is contained in:
Zach Brown
2016-06-13 18:42:08 -05:00
parent 55fe08d4b9
commit 03eeadc2df
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Entity-Origin-API.patch
View File

@@ -127,8 +127,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
@@ -0,0 +0,0 @@ public class CraftFallingSand extends CraftEntity implements FallingSand { @@ -0,0 +0,0 @@ public class CraftFallingSand extends CraftEntity implements FallingSand {
public void setHurtEntities(boolean hurtEntities) { // Second field for EntityFallingBlock
getHandle().hurtEntities = hurtEntities; getHandle().ticksLived = value;
} }
+ +
+ // Paper start + // Paper start

2
work/Bukkit

Submodule work/Bukkit updated: 82821325a6...268e8e7836

2
work/CraftBukkit

Submodule work/CraftBukkit updated: 7f1a32252b...fb568fdc70