Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-08 00:21:50 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown 2017-02-10 18:12:58 -06:00
parent 75618c5da8
commit 3e91cc60e4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a2d476818..193dadf43 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity { @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@ -22,7 +22,7 @@ index a2d476818..193dadf43 100644
this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i)); this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i));
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 5520c707e..eeb4f5b32 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

2
work/Bukkit

@ -1 +1 @@
Subproject commit 50702e72bc019590101e6c47b14b42db33de46a9 Subproject commit 1861013a8c070400d70d3b9703e1c9afcce0be80

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 3c48711c053bf7c007964f17135c56d6dfe1fda6 Subproject commit a552117725a316dbae014fb85e431e5264e631d4

2
work/Spigot

@ -1 +1 @@
Subproject commit b4417b8d188ae9d59bc9fc02bbc5b08690e40f64 Subproject commit 65a03470106fdceec943006e8b9b1cb3f5b89235