Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

make initAttributes non abstract

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-21 23:00:24 -05:00
parent afabb3c5b6
commit fb509120d8
15 changed files with 48 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0153-Movement-options-for-armor-stands.patch
View File

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e6d8a421b0e5496df9ea3fc01f88c2f3c6c527b4..e879f7bdee9c58533a549f22286ebb8a22a30442 100644
index 478dbfe8eeff9e6e03f77a00869df06b5a1eda3c..5ad88dccb7fdc2630a273e6645f8612079c51fd2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1402,7 +1402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -30,7 +30,7 @@ index e6d8a421b0e5496df9ea3fc01f88c2f3c6c527b4..e879f7bdee9c58533a549f22286ebb8a
this.wasTouchingWater = false;
} else if (this.updateFluidHeightAndDoFluidPushing((Tag) FluidTags.WATER, 0.014D)) {
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
index 8a30031c8e96eaff27416adfe32e752efc246752..12172f9f5cb03d3c999f17a8131c79ac4bb0e176 100644
index 796ab61f4513c02b0d55d34044d2f7084c447796..d119f8ab447bc17deabc494463de496161c9b126 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -99,10 +99,12 @@ public class ArmorStand extends LivingEntity {
@@ -46,7 +46,7 @@ index 8a30031c8e96eaff27416adfe32e752efc246752..12172f9f5cb03d3c999f17a8131c79ac
this.handItems = NonNullList.withSize(2, ItemStack.EMPTY);
this.armorItems = NonNullList.withSize(4, ItemStack.EMPTY);
this.headPose = ArmorStand.DEFAULT_HEAD_POSE;
@@ -1003,4 +1005,18 @@ public class ArmorStand extends LivingEntity {
@@ -996,4 +998,18 @@ public class ArmorStand extends LivingEntity {
}
// Paper end
// Paper end
@@ -66,7 +66,7 @@ index 8a30031c8e96eaff27416adfe32e752efc246752..12172f9f5cb03d3c999f17a8131c79ac
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6de54168c90225465f6ab353fdbb84fb576d8685..b9ea0b66cd90abc757fe0dd046a84529fd49dca4 100644
index faed827a793ed026a223de00130199438776b070..5f50906a8facde4300995da5c0a634b2eb77fb14 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -89,10 +89,16 @@ public class PurpurWorldConfig {