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

skeleton horses can swim in water (close #765)

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-05 21:58:24 -05:00
parent 0ae1daa043
commit 5cbd2c7913
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0007-Configurable-entity-base-attributes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8389be51e564c734b899ee1049eeb811d111d263..0f34da80fe3dabe264c7cbb894f6f732d068a4b6 100644
index a33c9089d96ab8e66557be7880e562c88b5d56f9..52d8c713a6653f5b28b63a5ad1769a471fe5aaa9 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -149,7 +149,7 @@ import org.bukkit.plugin.PluginManager;
@@ -34,7 +34,7 @@ index 03adc3b746e05bb4b0514ba4a66c101b9742ceed..ec261673ac444fd5de9c8556cde5d788
@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c455a43a87b07ba5f7787bb9f3bbd0caf8095151..8da5c1a3b0dce2952a14242620556ca10d340da8 100644
index 6953ff6f4f1b607f9294ca37022226fde260150b..c2a71319be3340d50bd8b15f39ae8d4937aeb7ac 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -285,6 +285,7 @@ public abstract class LivingEntity extends Entity {
@@ -1390,7 +1390,7 @@ index 5025d4571a34fe9e0e58ada6b81b064716b8f672..f6734f2eb44af7b2389de5079831e0e4
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 033c64fb98e08a67636c1c5e3d67b15ba0c0098b..b0fe7478f3dd5bacdef040caf9bbc75974303d89 100644
index 1b174af3c47cb49d4ee4b7a6968e24510b3730eb..9a8e08e9a44900ad3899a63992948941abe7c5d8 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -166,6 +166,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -1422,7 +1422,7 @@ index ab648e7dafd78f414646cef96b422e87da5c1982..0bcfece84ac11f04671ed38a99b31da9
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 08180dd66c3ab3e96437013b27b0224ab4241187..aa9a7f5cbc5d20192455d0f241a0703f46404ed8 100644
index 181b5912341612862a85553b2d9b43fc3b236557..c250faf84817f67dea7f088fa2530be82fcf7688 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -104,257 +104,573 @@ public class PurpurWorldConfig {
@@ -2197,7 +2197,7 @@ index 08180dd66c3ab3e96437013b27b0224ab4241187..aa9a7f5cbc5d20192455d0f241a0703f
+ skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
}
public boolean skeletonHorseRidableInWater = false;
public boolean skeletonHorseRidableInWater = true;
public boolean skeletonHorseCanSwim = false;
+ public double skeletonHorseMaxHealthMin = 15.0D;
+ public double skeletonHorseMaxHealthMax = 15.0D;