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

configurable mob size attribute (#1538)

Browse Source
This commit is contained in:
granny
2024-06-21 04:11:09 -07:00
committed by GitHub
parent c0f5e78dc2
commit b82f6939fe
234 changed files with 2140 additions and 1855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0251-Remove-Mojang-Profiler.patch
View File

@@ -1485,10 +1485,10 @@ index 51772f03a3469b11e7166ec6f3a1b9c64a606221..02f2f46ccc48bb4d9bd08555818b0489
this.seen.add(i);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index 49dccfc0010b5727250f7e27591502408c903739..37bdc1bd1ce7f402418b1e8c57c6f58540571ec2 100644
index 902882ca639eee6efe102ea70e182fb17df801c2..0f9196cc26e5c670a7f3454326b762f0303f633c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -254,13 +254,13 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -260,13 +260,13 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@Override
protected void customServerAiStep() {
@@ -1507,10 +1507,10 @@ index 49dccfc0010b5727250f7e27591502408c903739..37bdc1bd1ce7f402418b1e8c57c6f585
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
index 6e01e5847396e14ce1d9af53f1ed29ef360d1b31..ef69b630d93b4e630083b852b126b6d939cb5f07 100644
index 711253a3e004c8ec850579f17d8497ffe2cf3ba0..3c4c654a4c7c7ed7b4c967f768b55921e8a8690e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
@@ -158,12 +158,12 @@ public class Armadillo extends Animal {
@@ -159,12 +159,12 @@ public class Armadillo extends Animal {
@Override
protected void customServerAiStep() {
@@ -1528,10 +1528,10 @@ index 6e01e5847396e14ce1d9af53f1ed29ef360d1b31..ef69b630d93b4e630083b852b126b6d9
this.playSound(SoundEvents.ARMADILLO_SCUTE_DROP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F);
this.forceDrops = true; // CraftBukkit
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 93e5fd3509dc5fd9ff1087058d98003ab467dd04..44e0c8c25f6aadfb5f1715df4770391da0104381 100644
index 091fbd162a63ec523197a953e65c00a54dae5ef9..e3178e2562a45f09c6567bb63112aa84fc59ea1d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -308,13 +308,13 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -309,13 +309,13 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@Override
protected void customServerAiStep() {
@@ -1639,10 +1639,10 @@ index fab01a3e779e39962ef04305540e2fe3043072a2..4feddea8703d25a671fe11617f99e1fa
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index 14264a491061ef17c9fd3fea36c0505d06e88277..072f6ea6ed0bb543b1d71628a1e1e43f73719a09 100644
index d82b036b5a759574fe83027ec1000d7eb0455a28..b6f5281705ce4c7a755e3818cf6c4a2235a024f9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -504,11 +504,11 @@ public class Sniffer extends Animal {
@@ -505,11 +505,11 @@ public class Sniffer extends Animal {
@Override
protected void customServerAiStep() {
@@ -1658,10 +1658,10 @@ index 14264a491061ef17c9fd3fea36c0505d06e88277..072f6ea6ed0bb543b1d71628a1e1e43f
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
index 541acd5d2208b64977f33049cc0cbd9f8c136ccb..41c17c92bf5ec63ab6e0325936dbe52606524c60 100644
index 6817f88c422480f201552300ae78053321e41bb8..0cf110be4ec7823996e89c1d1e014e091c1d3d8a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
@@ -265,10 +265,10 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@@ -266,10 +266,10 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@Override
protected void customServerAiStep() {
@@ -1694,10 +1694,10 @@ index ee9098f311b5db7251fcaf3ca199ae51ec1f2a2a..0d8e49e4f3c52244f8f84d6e4beeaa60
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index 9fcdc3dc71240450b983a071e21f24d497aa06e6..ee1fcffc3f94795ea0c53d9e9a5d1d28380321ef 100644
index 705385f5136ab6e063207004a045ed6a860b9903..ef263efa3ec00c36f938158356c34fb87c52c7bc 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -192,10 +192,10 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -193,10 +193,10 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@Override
protected void customServerAiStep() {
@@ -1711,10 +1711,10 @@ index 9fcdc3dc71240450b983a071e21f24d497aa06e6..ee1fcffc3f94795ea0c53d9e9a5d1d28
if (this.isConverting()) {
this.timeInOverworld++;
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index eb0deccb2f39dbe5ad47c689b0858b69fc08782f..44b64c00d43a40f66d2711abf3839c5b195f419f 100644
index 02294488328707a7a67442669eeb48212c1452ab..6348d7a63b6fcfecc899fd7d1e0b941214acce01 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -327,10 +327,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -328,10 +328,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@Override
protected void customServerAiStep() {
@@ -1728,10 +1728,10 @@ index eb0deccb2f39dbe5ad47c689b0858b69fc08782f..44b64c00d43a40f66d2711abf3839c5b
super.customServerAiStep();
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
index 71d2501e88a99819ef305fa8715418aad65ec81d..407a0f27719d3944b3a005c664d80246ea1c7cf4 100644
index 5537f4e2bdce05ef5863955b9403eda7b04ec0d5..2f43bef3acd9db78ecc869f5ff0f4d0f5e121d28 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
@@ -138,10 +138,10 @@ public class PiglinBrute extends AbstractPiglin {
@@ -139,10 +139,10 @@ public class PiglinBrute extends AbstractPiglin {
@Override
protected void customServerAiStep() {
@@ -1762,10 +1762,10 @@ index ba560ab0340c06614547dcddbdcbd1bbda44bb79..6ee394c1616db9b0203b3e52e39234d0
if ((this.tickCount + this.getId()) % 120 == 0) {
Warden.applyDarknessAround(worldserver, this.position(), this, 20);
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 2b55f05b727f862ea79ab2c200a756f663b43823..ef6d82593d18533ad6b67bc0ae304d98270fbfd8 100644
index d4f64414a0351999a04308a3d26d15c9ddf266c7..88972d9f07eb9088c139d9dbc974b2e61943f292 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -341,7 +341,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -342,7 +342,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
}
protected void customServerAiStep(boolean inactive) { // Purpur - not final
// Paper end
@@ -1774,7 +1774,7 @@ index 2b55f05b727f862ea79ab2c200a756f663b43823..ef6d82593d18533ad6b67bc0ae304d98
// Purpur start
if (this.level().purpurConfig.villagerLobotomizeEnabled) {
// treat as inactive if lobotomized
@@ -357,7 +357,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -358,7 +358,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
this.getBrain().tick((ServerLevel) this.level(), this); // Paper
}
// Purpur end*/ // Purpur - TODO: Pufferfish