Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 10:35:38 +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 532e7d4fa8
commit e9eb9ec7eb
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From 478aa5503a8330df7b3f266a55185ef1477116d6 Mon Sep 17 00:00:00 2001 From fcb63753987197c3522f2bfe8ea9edc55992e26f Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:47:25 -0600 Date: Wed, 21 Dec 2016 11:47:25 -0600
Subject: [PATCH] Add API methods to control if armour stands can move 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 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 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving { @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@ -16,10 +16,10 @@ index 5603a3746..fcbfcd6a9 100644
public EntityArmorStand(World world) { public EntityArmorStand(World world) {
super(world); super(world);
@@ -763,4 +764,13 @@ public class EntityArmorStand extends EntityLiving { @@ -770,4 +771,13 @@ public class EntityArmorStand extends EntityLiving {
public boolean cS() { return this.yaw;
return false;
} }
// CraftBukkit end
+ +
+ // Paper start + // Paper start
+ @Override + @Override

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

@ -1,14 +1,14 @@
From ebcc56e4fd745a5aababc0303aebd049be413790 Mon Sep 17 00:00:00 2001 From 89a90d5503d97cca00fcd9d1c63e76e72755082a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 18 Feb 2017 19:29:58 -0600 Date: Sat, 18 Feb 2017 19:29:58 -0600
Subject: [PATCH] Do not let armorstands drown 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 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 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -772,5 +772,10 @@ public class EntityArmorStand extends EntityLiving { @@ -779,5 +779,10 @@ public class EntityArmorStand extends EntityLiving {
super.move(moveType, x, y, z); super.move(moveType, x, y, z);
} }
} }

2
work/CraftBukkit

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