Update CB
Dieser Commit ist enthalten in:
Ursprung
532e7d4fa8
Commit
e9eb9ec7eb
@ -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>
|
||||
Date: Wed, 21 Dec 2016 11:47:25 -0600
|
||||
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
|
||||
@@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
|
||||
@ -16,10 +16,10 @@ index 5603a3746..fcbfcd6a9 100644
|
||||
|
||||
public EntityArmorStand(World world) {
|
||||
super(world);
|
||||
@@ -763,4 +764,13 @@ public class EntityArmorStand extends EntityLiving {
|
||||
public boolean cS() {
|
||||
return false;
|
||||
@@ -770,4 +771,13 @@ public class EntityArmorStand extends EntityLiving {
|
||||
return this.yaw;
|
||||
}
|
||||
// CraftBukkit end
|
||||
+
|
||||
+ // Paper start
|
||||
+ @Override
|
||||
|
@ -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>
|
||||
Date: Sat, 18 Feb 2017 19:29:58 -0600
|
||||
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
|
||||
@@ -772,5 +772,10 @@ public class EntityArmorStand extends EntityLiving {
|
||||
@@ -779,5 +779,10 @@ public class EntityArmorStand extends EntityLiving {
|
||||
super.move(moveType, x, y, z);
|
||||
}
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 9ab758c7b608854ec658450227c2a17e51845de5
|
||||
Subproject commit b8f84f375b2c82aa9448c4492cf7a8146cb077aa
|
In neuem Issue referenzieren
Einen Benutzer sperren