Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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

41
patches/server/0004-Configurable-entity-base-attributes.patch
View File

@@ -4,25 +4,6 @@ Date: Thu, 10 Dec 2020 16:44:54 -0600
Subject: [PATCH] Configurable entity base attributes
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4ed4ca8e623784f12e2c7850e1c055f30a16e5ec..6a9335366ef8a8b7f4506b67d85f7938e08696b3 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -334,6 +334,14 @@ public class ServerPlayer extends Player {
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
}
+
+ // Purpur start
+ @Override
+ public void initAttributes() {
+ // none to initialize
+ }
+ // Purpur end
+
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
double rads = Math.toRadians(net.minecraft.server.MCUtil.normalizeYaw(this.yRot + 90)); // MC rotates yaw 90 for some odd reason
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a791660ed 100644
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
@@ -40,7 +21,7 @@ index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a
@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index e918f7cc7fdfdeb1b7b69488eadf69f0d4a3cb05..86bc564010f18cb2518b8044fe4a4763bc6e4e53 100644
index e918f7cc7fdfdeb1b7b69488eadf69f0d4a3cb05..b3921a084d20a25a6ea775faae43493030aafd77 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -288,6 +288,7 @@ public abstract class LivingEntity extends Entity {
@@ -55,7 +36,7 @@ index e918f7cc7fdfdeb1b7b69488eadf69f0d4a3cb05..86bc564010f18cb2518b8044fe4a4763
this.brain = this.makeBrain(new Dynamic(dynamicopsnbt, (net.minecraft.nbt.Tag) dynamicopsnbt.createMap((Map) ImmutableMap.of(dynamicopsnbt.createString("memories"), (net.minecraft.nbt.Tag) dynamicopsnbt.emptyMap()))));
}
+ protected abstract void initAttributes(); // Purpur
+ protected void initAttributes() {}// Purpur
+
public Brain<?> getBrain() {
return this.brain;
@@ -765,24 +746,6 @@ index 68c5609845617bf5aeb82ea4e3a88bdccb8273cc..96631591db018545120ba1c9980a03eb
}
} else {
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 5fc66d7096afcfe63eba774e1dc330ac3263e4b0..585d5fa1604d137b0d426abccec51a6f47c73ac1 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -119,6 +119,13 @@ public class ArmorStand extends LivingEntity {
this.setPos(x, y, z);
}
+ // Purpur start
+ @Override
+ public void initAttributes() {
+ // none to initialize
+ }
+ // Purpur end
+
// CraftBukkit start - SPIGOT-3607, SPIGOT-3637
@Override
public float getBukkitYaw() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
index a5294012d432d5d1fce570a1eb1b1716a24522de..83f9a1139a501135a89a758993c7ff209b5b92d5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java