Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Update CB

Browse Source
This commit is contained in:
Shane Freeder 2017-10-13 22:07:48 +01:00
parent a7bbff405e
commit 0e26fc4fbb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 5603a3746..fcbfcd6a9 100644
index 94b1602a4..f95b2c573 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@ -17,9 +17,9 @@ index 5603a3746..fcbfcd6a9 100644
public EntityArmorStand(World world) {
super(world);
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
public boolean cS() {
return false;
return this.yaw;
}
// CraftBukkit end
+
+ // Paper start
+ @Override

2
Spigot-Server-Patches/Do-not-let-armorstands-drown.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index fcbfcd6a9..7899324ed 100644
index f95b2c573..798711d2d 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 9ab758c7b608854ec658450227c2a17e51845de5
Subproject commit b8f84f375b2c82aa9448c4492cf7a8146cb077aa