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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e16fefb [ci skip] add 'accepted' to Done project category (#9429)
PaperMC/Paper@171ba7c Move Log4j plugins to own source set (#9428)
PaperMC/Paper@4356758 Call missing BlockDispenseEvents (#8518)
PaperMC/Paper@c0936a7 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
PaperMC/Paper@12c9700 Fix ThrownEggHatchEvent#setHatching (#9448)
This commit is contained in:
granny
2023-07-05 20:32:26 -07:00
parent ab2f1c06ce
commit b21daa9622
105 changed files with 679 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
patches/server/0229-Mobs-always-drop-experience.patch
View File

@@ -21,10 +21,10 @@ index 1a67f46b57e398d23fbc495ee81ae62e0d84d3dc..43cdda0cb26c5d5cc9025199eb71673d
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
index acd453eefe78eb29c914ee2ce93202dfec9e8d63..f670c1aa00ebbad111b64d1b23255188288a91f2 100644
index c103c3da165ec4a9717400fdf278de2a667edd2a..1eab1393a2636c4a247f25dae317cea60cc7021c 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -295,6 +295,11 @@ public class Bat extends AmbientCreature {
@@ -281,6 +281,11 @@ public class Bat extends AmbientCreature {
return this.level().purpurConfig.batTakeDamageFromWater;
}
@@ -37,10 +37,10 @@ index acd453eefe78eb29c914ee2ce93202dfec9e8d63..f670c1aa00ebbad111b64d1b23255188
public void readAdditionalSaveData(CompoundTag nbt) {
super.readAdditionalSaveData(nbt);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index 318e51509338a7cf22dfeb1a923638d8df2b5c2f..fad2da0ba194d349de73777a7ab43bb6447298e7 100644
index 0ee62562d36292d48226a3b20ac54aafe6d12394..ac4ca4de2be18a08268b24dfe259cfd136b1a4da 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -481,6 +481,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -486,6 +486,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
return this.level().purpurConfig.beeTakeDamageFromWater;
}
@@ -101,10 +101,10 @@ index 2343325fa9a771de7b9445cda24a2bcd7a7c1761..f0b6118a9995bb41836685bbf94d2e7f
public ItemStack getBucketItemStack() {
return new ItemStack(Items.COD_BUCKET);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
index 30e87b71ad237d76ec5adb4976edeca909e429ef..6aeb3a6ac9665a0c4b929d0f034f177df88109e0 100644
index 37f073e821a1b0f8efe89a7d88ce732cda402dff..3cee7d5656b2df2997ceaee3489c02ce881e6875 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -83,6 +83,11 @@ public class Cow extends Animal {
@@ -84,6 +84,11 @@ public class Cow extends Animal {
return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
}
@@ -117,10 +117,10 @@ index 30e87b71ad237d76ec5adb4976edeca909e429ef..6aeb3a6ac9665a0c4b929d0f034f177d
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
index 3755ffc395ec4644a2263c59cdacfdbab258d4c8..dcb23409b8492200771c515a83d086b39777972f 100644
index 4713e550d26c3235ee7ca227ce7e0ff31ff4321c..91e9a872b0282f50e2389ab21798fc06da8dbd6a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -165,6 +165,11 @@ public class Dolphin extends WaterAnimal {
@@ -169,6 +169,11 @@ public class Dolphin extends WaterAnimal {
return this.level().purpurConfig.dolphinTakeDamageFromWater;
}
@@ -133,7 +133,7 @@ index 3755ffc395ec4644a2263c59cdacfdbab258d4c8..dcb23409b8492200771c515a83d086b3
@Override
public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
index 1cc0f08a1b63a6786d62fb1ee120e47f1b622d52..d9d4341c4511f4982f691eeea80ef17de759291a 100644
index ed7d057bc12ca0e3d808320a008c902ebb27e1ca..ca3096abbd54745af591101c7b306ed87f212954 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -196,6 +196,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -181,7 +181,7 @@ index 56fb35206af7e04a78eba489d444135176188a20..1b0a0e36baa0f664f06b2d166aa907b3
public float getWalkTargetValue(BlockPos pos, LevelReader world) {
return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
index 851ffdc7156ac9a49692cbcd9f0c9c1887aae971..b02f881bd5d8dc2cc5c37d7cf89536e69d8a0e3a 100644
index 19ef910a77804b60c25449d084f140210778adf4..c72d5e7c2a19c5690a8065c95c75f0415358c2a9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
@@ -100,6 +100,11 @@ public class Ocelot extends Animal {
@@ -197,10 +197,10 @@ index 851ffdc7156ac9a49692cbcd9f0c9c1887aae971..b02f881bd5d8dc2cc5c37d7cf89536e6
return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
index ae4108c833e6dba02b19dd3e6271530e5e46cecc..92638ac85237e4532024fbf75c7d5d38dcd8b4bc 100644
index efdcfd3885d61cb3ec8db45d1f7f5a64e9c2ac24..bd7c5f6768a54a3d8ffd585d91414e65936991da 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
@@ -150,6 +150,11 @@ public class Panda extends Animal {
@@ -153,6 +153,11 @@ public class Panda extends Animal {
return this.level().purpurConfig.pandaTakeDamageFromWater;
}
@@ -213,7 +213,7 @@ index ae4108c833e6dba02b19dd3e6271530e5e46cecc..92638ac85237e4532024fbf75c7d5d38
public boolean canTakeItem(ItemStack stack) {
EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
index bfae3b94ab035e1c27c988cfcc3b449c7266efd3..8526556c42a411414b322553c295fb430ceffa71 100644
index 6e8fc61b04796da5a8820812b5e88110f774b77a..0e20d9ed5b25f5aaab68dc3a4fa4e63ced280969 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
@@ -206,6 +206,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -277,21 +277,21 @@ index ef3d0bbbeb6aa736f35c26066a1473c70ef028a2..54f5206b686c3cf4d2e5b470c07047a5
protected void defineSynchedData() {
super.defineSynchedData();
diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
index a91cef9b519b9d7330c40de9988f0463ce8aa20b..2bd8f6d05728b48e184f4835d6acb3a00cf66153 100644
index 3a30a04644cbc21729c4dbb65e3fa5a95e3bed6f..b8e099ef68b7ce1e779e17a7fec05198ec350276 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
@@ -152,6 +152,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
public boolean isSensitiveToWater() {
return this.level().purpurConfig.rabbitTakeDamageFromWater;
}
+
+ @Override
+ protected boolean isAlwaysExperienceDropper() {
+ return this.level().purpurConfig.rabbitAlwaysDropExp;
+ }
+
// CraftBukkit start - code from constructor
public void initializePathFinderGoals(){
this.setSpeedModifier(0.0D);
// Purpur end
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Salmon.java b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
index e101c3bf425902908c43ffa18867fb83a5e1f16e..382e47f26ee94506cb76463a677351b9bdcf8040 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
@@ -325,7 +325,7 @@ index 35decea07efa8ca9f7ed896be9b8f3eb5afbf082..a1b323ecba25910e97f154e487acc949
protected void registerGoals() {
this.eatBlockGoal = new EatBlockGoal(this);
diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
index e33364beff36e255989520d5d076729c9c8ed1fe..dd4d3dbda72a3bf0aabce0f999121f401f85b8a4 100644
index 20f2fd0edf290d448d06e4772b5947fc7865c20b..fc8526af7e1df15794b4560b58e7f6a47508aa08 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
@@ -86,6 +86,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -341,10 +341,10 @@ index e33364beff36e255989520d5d076729c9c8ed1fe..dd4d3dbda72a3bf0aabce0f999121f40
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
index 80192e663bf8998d38fb3933894608327e50c46c..beef2f6a42eebeaf5761bac841300f780bfdf4f2 100644
index 57b37ac40b4ffe6c5e27548755aaa15da89a0f0b..88c238e492b1081d1a64a3b6f05d7baa17e5d8c9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
@@ -97,6 +97,11 @@ public class Squid extends WaterAnimal {
@@ -95,6 +95,11 @@ public class Squid extends WaterAnimal {
return this.level().purpurConfig.squidTakeDamageFromWater;
}
@@ -373,7 +373,7 @@ index b16d075581a352714f86f1b87805f24c9e336aa3..87b6f6b10ba6e3d9c6a42298a2019a52
return "entity.minecraft.tropical_fish.predefined." + variant;
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index 9f8891a3eacf461071ce7ad2a277c78048171d51..7787b121def6525642672dfd67fae9ac0e010f52 100644
index df9a7975959393ab2e81fa7c3878afd034ef7f90..1502f13acd0a104efe470e605826213ea92af191 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -115,6 +115,11 @@ public class Turtle extends Animal {
@@ -389,10 +389,10 @@ index 9f8891a3eacf461071ce7ad2a277c78048171d51..7787b121def6525642672dfd67fae9ac
this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index b2902e01ff2e9add8258bfd0b32d000209208f52..e7558511e0690d80ff444e71b7524d564d68842b 100644
index c967302542eeac0bad33c3b53b7d5b2aea7defbb..64bceae4d06b35fcbecb0daca2496ba30e39d995 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -214,6 +214,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -215,6 +215,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
return this.level().purpurConfig.wolfTakeDamageFromWater;
}
@@ -421,10 +421,10 @@ index 6aaf20501558f1710be0adca9c14441448698541..51b475191113cf3cae5e776b0dfbcd02
public Map<String, Vector3f> getModelRotationValues() {
return this.modelRotationValues;
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index 6a917ef18f1f3797903e6f8b4516c0df8757c573..df08f220b7c25fd9e7daa6a23816cb8d6ff4c003 100644
index 83a3a87caba237b382e4409339e98b6b99a005b7..0f8af63a88e425e5e66f68133b6c604caefc6977 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -116,6 +116,11 @@ public class Goat extends Animal {
@@ -117,6 +117,11 @@ public class Goat extends Animal {
return this.level().purpurConfig.goatTakeDamageFromWater;
}
@@ -469,7 +469,7 @@ index f8dbea402f723bf38d7ab3f2468d1b02b7124560..3b1faa63e46a48e83ea672cf6da444a1
protected void randomizeAttributes(RandomSource random) {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
index 26ed1eef3b38e643dfc6738e4b7880c9d1c9dc20..70ac8c2fef15587d57f37c72db7913fd89f05d31 100644
index fac46dd905f9a634cff393494f6ff0404eb17fb7..a9f36af3e07f74b3d11697d5fad9f0a469844779 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -148,6 +148,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -549,7 +549,7 @@ index 063cdf8202af060b64a52b6af6fdf8fd477df0ed..1dbe73dda3fb3f32b354c416908d37ae
return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index 15229503e40f1a3f5cd768c6f55e250f1bd40fec..3a6b2d0a6a4300914b2d9c135f9618d6217a25cb 100644
index 5825fd748325b496419fce991abbb3471687e9e8..c23f346bbec84f3b474d53994f60714f75ed61d0 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -132,6 +132,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -597,7 +597,7 @@ index aed77678edfeeeb646804a1c3b32c4ae8672074d..bf218586a79ea5f4288a64ccf6c245ee
public boolean doHurtTarget(Entity target) {
if (super.doHurtTarget(target)) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index 45a9496d9d6109b5ad844113dfd431770144b22f..05576ef4d7476f1c04d47e76bec277abea3f6afb 100644
index 8952afb0ff84df6f99bd545cb4a8a44e87f8d878..f82c0cf252aea9441a625a312feb1e557a528e3f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -277,6 +277,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -645,10 +645,10 @@ index b494d5689beb19d621f5d7c9c22d84e12d303fa0..b30f13d2a7198f568bc36c0d974fd6dc
return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index bf9b9f3de67ff918e0a2288b3582af5e77e54b04..a315a5ff2674610675a819a9cf6d7c22ea0d6adc 100644
index 869f7488f420f23941754d484546901cd25bcd6f..f476928b400b9244052b1d71e6cb2369045fe0f2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -114,6 +114,11 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -118,6 +118,11 @@ public class EnderMan extends Monster implements NeutralMob {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.endermanMaxHealth);
}
@@ -821,10 +821,10 @@ index 1f64dc8442de75447c17ae4fd5483345d4b7fd3e..06d52d8b61abc4dbbdc953bfed2e688b
protected void registerGoals() {
super.registerGoals();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
index 9083bc138d322cbb0b060c73dadc427aaa574bd9..dc55bf60f6e37971525214c1e872119e8fc92fe8 100644
index ba0fdfb017db4c9e5250e7b8e22c61045250b0f3..219a9df146e7cb4c1065f003d4562f0a711f80e9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -98,6 +98,11 @@ public class Ravager extends Raider {
@@ -101,6 +101,11 @@ public class Ravager extends Raider {
return this.level().purpurConfig.ravagerTakeDamageFromWater;
}
@@ -837,7 +837,7 @@ index 9083bc138d322cbb0b060c73dadc427aaa574bd9..dc55bf60f6e37971525214c1e872119e
protected void registerGoals() {
super.registerGoals();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
index fbafb9e2ea9dfd237560d34f9cd6f29533e31f16..d1a80dfb51b86f92b37bbb4c235e38d2b8713541 100644
index 714adaf017813eb64bb3a9a60b5ff45737e4d95d..3e2c60a301d4c66c85cd8ff812331005a667dc4e 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -142,6 +142,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -853,10 +853,10 @@ index fbafb9e2ea9dfd237560d34f9cd6f29533e31f16..d1a80dfb51b86f92b37bbb4c235e38d2
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
index da9e7a70c781196495f5b35fab706dc3dffa487b..2eefdf34ccb955b1e5c39bd534e7831c1786198e 100644
index 6bdaec8e082c65959f2ee1cfe4257ba0d64bd8fa..406ce5b56f73253b034b096438c7506b63007532 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
@@ -69,6 +69,11 @@ public class Silverfish extends Monster {
@@ -72,6 +72,11 @@ public class Silverfish extends Monster {
return this.level().purpurConfig.silverfishTakeDamageFromWater;
}