core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0011-Configurable-baby-zomb...

55 lines
3.1 KiB
Diff
Raw Normal View History

Update config version
2019-10-26 23:07:42 +00:00
From 25cefafc2d98a1e48a7c89eba39e0aaa4dbf0e51 Mon Sep 17 00:00:00 2001
Paper 1.9
2016-02-29 23:09:49 +00:00
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 13:09:16 -0600
Subject: [PATCH] Configurable baby zombie movement speed
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Update config version
2019-10-26 23:07:42 +00:00
index 098bd3fba..912611cf1 100644
Paper 1.9
2016-02-29 23:09:49 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Rename baby zombie movement config option This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
2019-10-26 22:55:58 +00:00
@@ -73,4 +73,15 @@ public class PaperWorldConfig {
Paper 1.9
2016-02-29 23:09:49 +00:00
log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
}
+
Rename baby zombie movement config option This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
2019-10-26 22:55:58 +00:00
+ public double babyZombieMovementModifier;
+ private void babyZombieMovementModifier() {
+ babyZombieMovementModifier = getDouble("baby-zombie-movement-modifier", 0.5D);
Update config version
2019-10-26 23:07:42 +00:00
+ if (PaperConfig.version < 20) {
Rename baby zombie movement config option This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
2019-10-26 22:55:58 +00:00
+ babyZombieMovementModifier = getDouble("baby-zombie-movement-speed", 0.5D);
+ set("baby-zombie-movement-modifier", babyZombieMovementModifier);
+ }
+
+ log("Baby zombies will move at the speed of " + babyZombieMovementModifier);
Paper 1.9
2016-02-29 23:09:49 +00:00
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
Rename baby zombie movement config option This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
2019-10-26 22:55:58 +00:00
index b8761e706..4d4e8d022 100644
Paper 1.9
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 3d9d2efc SPIGOT-5202: WorldCreator#copy does not copy all options CraftBukkit Changes: 3e7b3862 SPIGOT-5195 (#2): Player loot table does not drop when keepInventory is on c88867e4 SPIGOT-5208: Reset state on cancelled EntityTransformEvent to prevent event spam f744c09c SPIGOT-5214: setCooldown not working 860b3540 SPIGOT-5204: Typo in deprecated enchantment name
2019-07-28 14:32:14 +00:00
@@ -21,7 +21,7 @@ public class EntityZombie extends EntityMonster {
Paper 1.9
2016-02-29 23:09:49 +00:00
More work towards 1.14 pre5
2019-04-24 01:00:24 +00:00
protected static final IAttribute d = (new AttributeRanged((IAttribute) null, "zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D)).a("Spawn Reinforcements Chance");
private static final UUID b = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
- private static final AttributeModifier c = new AttributeModifier(EntityZombie.b, "Baby speed boost", 0.5D, AttributeModifier.Operation.MULTIPLY_BASE);
Rename baby zombie movement config option This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
2019-10-26 22:55:58 +00:00
+ private final AttributeModifier c = new AttributeModifier(EntityZombie.b, "Baby speed boost", world.paperConfig.babyZombieMovementModifier, AttributeModifier.Operation.MULTIPLY_BASE); private final AttributeModifier babyModifier = this.c; // Paper - remove static - Make baby speed configurable
More work towards 1.14 pre5
2019-04-24 01:00:24 +00:00
private static final DataWatcherObject<Boolean> bz = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
private static final DataWatcherObject<Integer> bA = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.b);
public static final DataWatcherObject<Boolean> DROWN_CONVERTING = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 3d9d2efc SPIGOT-5202: WorldCreator#copy does not copy all options CraftBukkit Changes: 3e7b3862 SPIGOT-5195 (#2): Player loot table does not drop when keepInventory is on c88867e4 SPIGOT-5208: Reset state on cancelled EntityTransformEvent to prevent event spam f744c09c SPIGOT-5214: setCooldown not working 860b3540 SPIGOT-5204: Typo in deprecated enchantment name
2019-07-28 14:32:14 +00:00
@@ -129,9 +129,9 @@ public class EntityZombie extends EntityMonster {
Paper 1.9
2016-02-29 23:09:49 +00:00
if (this.world != null && !this.world.isClientSide) {
AttributeInstance attributeinstance = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
Update to 1.14.4 (#2333)
2019-07-20 04:01:24 +00:00
- attributeinstance.removeModifier(EntityZombie.c);
+ attributeinstance.removeModifier(this.babyModifier); // Paper
Paper 1.9
2016-02-29 23:09:49 +00:00
if (flag) {
Update to 1.14.4 (#2333)
2019-07-20 04:01:24 +00:00
- attributeinstance.addModifier(EntityZombie.c);
+ attributeinstance.addModifier(this.babyModifier); // Paper
Paper 1.9
2016-02-29 23:09:49 +00:00
}
}
--
Rename baby zombie movement config option This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
2019-10-26 22:55:58 +00:00
2.23.0
Paper 1.9
2016-02-29 23:09:49 +00:00