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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@2033dba Updated Upstream (CraftBukkit)
PaperMC/Paper@a3ad720 Remove ChatColor usages (#7543)
PaperMC/Paper@8fc0999 Fix some nullability things (#7275)
PaperMC/Paper@fd069dd Remove incorrect throws javadoc in Team (#7869)
PaperMC/Paper@bed5cb2 Limit resolved selectors when enabled
PaperMC/Paper@4d83ed0 [ci skip] Changing the order of the rebase with autosquash command in the contributing.md (#6974)
PaperMC/Paper@071a4a2 throw exception if worlds are created while being ticked (#7653)
PaperMC/Paper@5b6397a Make leave messages for kicks the same as for quitting (#7874)
PaperMC/Paper@5befb55 Updated Upstream (Bukkit/CraftBukkit) (#7875)
PaperMC/Paper@b3deb25 Move some methods to RegionAccessor (#7635)
PaperMC/Paper@d8ef841 [DataConverter] Fix generator options parsing
PaperMC/Paper@4b27254 Fix treasure maps discovered settings (#7627)
PaperMC/Paper@276d830 Fix campfire walker in V1920

Pufferfish Changes:
pufferfish-gg/Pufferfish@671d68b Add Entity TTLs
pufferfish-gg/Pufferfish@aaca13d Updated Upstream (Paper)
This commit is contained in:
Ben Kerllenevich
2022-06-07 13:08:57 -04:00
parent 46a92bd39a
commit dc4a29b567
39 changed files with 345 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0244-Mobs-always-drop-experience.patch
View File

@@ -37,7 +37,7 @@ index 4d39f68a0d0de84474ef96f10cb35e97db2fd9f8..30ecad8a2530c2f4eb0ff0ae43f22d38
@Override
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 ca7225e80e1612120ac9b197e0188a06df8049a7..02fc6bb52419b75f04092b33e15e0ab1ea7a7b1a 100644
index e090cdf99ab637117494b3e8820e6b40b2387018..266b220a8b4a15ea267804139462af210fb23077 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -228,6 +228,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -53,7 +53,7 @@ index ca7225e80e1612120ac9b197e0188a06df8049a7..02fc6bb52419b75f04092b33e15e0ab1
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
index 8d49f4c9d5d9a0f4dc4a1c1dcdcc7bfc678d8de3..108c8b0d25ae9432a54b9bca4cae7297f303ca81 100644
index 9edd8b89abaa9a41dd50d859878703c02e514fd3..94d830e6b5dca78a56547872811a85328e3f2fff 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
@@ -162,6 +162,11 @@ public class Cat extends TamableAnimal {
@@ -69,7 +69,7 @@ index 8d49f4c9d5d9a0f4dc4a1c1dcdcc7bfc678d8de3..108c8b0d25ae9432a54b9bca4cae7297
public ResourceLocation getResourceLocation() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
index d7ddb71ae59ab0a0e10717e5c678ef5e5476aba4..d4b2e6715479c485258fdec9497a0da40e5df3ef 100644
index 439ce2e01cb861f2b3abb86090f49498e2a47142..df8e58ba17624089285abafe77753a02dd683ebc 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
@@ -85,6 +85,11 @@ public class Chicken extends Animal {
@@ -117,7 +117,7 @@ index b5002526f20fb8ae52783a6ba95ccd2d4f9b7840..a79b4a90274d25d427214b96649cdf85
@Override
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 f41aadb12c2d661014c488b4fc52298668c95da0..58dfa26b2935315e37d74f22dffe3e54ab83061a 100644
index a41ceccdf757ffbb87f972ef250b61734f3f3879..e6d00d7044eb16872455abf91dfaadcaeba6306b 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -168,6 +168,11 @@ public class Dolphin extends WaterAnimal {
@@ -181,7 +181,7 @@ index 047404f4e38b9d796ceecb4e07740942eb137ae0..48459f6c9a9d7112ef335725e1989883
@Override
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 5442baf10ca180b104bf1fd9cbcc12bb7a6146fc..3bfa7ed23d659899cccad5eb4caad6997ae2b419 100644
index b0f133931815155f1dab02e2853bbcde5c96bac6..2680b4cc2e4b2deb40e15e7d5d0f9b8c87f5ca56 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
@@ -98,6 +98,11 @@ public class Ocelot extends Animal {
@@ -325,7 +325,7 @@ index 4fa8e4a298a98b2a41ef7572d21ed50aa06e2c7e..17d1a0b43b2d155535cf2483af4ba9dd
@Override
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 b84376598527b7081808ee0c60fcd911c32ce7e7..83906fbb59d678451f93e6335aa674a7ff6bc9b1 100644
index c98e5b2cb54d4be5746d3bac0551ec743a656cbf..91fbfb0b1d1a01b7b644474014f621603415c225 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
@@ -84,6 +84,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -389,7 +389,7 @@ index 3c38345b32d106a169d1e6abcae54f282d08fe89..ddc69668c30e089df18858f697b6370d
public void setHomePos(BlockPos pos) {
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 f01a8b45d8af0659718587cb53a9c8e95b28bd80..de79fbaa5a84d5b19a29d491d28b11cb41b626bb 100644
index 303ac9f3941d6759b42ac1cae2586b4df3d9faaf..b5313e1c4a4be37bb7d129987a887b4697c75aa1 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -212,6 +212,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -405,7 +405,7 @@ index f01a8b45d8af0659718587cb53a9c8e95b28bd80..de79fbaa5a84d5b19a29d491d28b11cb
@Override
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 b7e2ed08864f5bde346faebf9498254dc9794ce6..d87a3434cbac31ef652e4dda08c280a5da51142e 100644
index efc02d00f3b95f4f6b6204b91ce15e03b23a6e6b..780a83fb0cec9f2124d0b0978e5fe5f86672d76e 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
@@ -134,6 +134,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -613,10 +613,10 @@ index 09d41e2adef76a4d3fb68b3a3002572144c9044c..4e5dc1e30f981a6bc33344a18af56a09
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
index 801e9919dbb197549372afb1b380cdb5f0c9290d..f7221565b51aa35218919a2efea9f83de4b1f786 100644
index 7e9c38d595c83bf482c701423d66c26a1ea1ea05..93b94077fe2d817ed3dd8c01cfaa2e45bb72a216 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
@@ -113,6 +113,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -114,6 +114,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.drownedTakeDamageFromWater;
}
@@ -645,7 +645,7 @@ index 2800594fea055d75268531d8ad3fef99721e5ca1..fc2b6dc1818d439905e90dc6d738c3cf
public static AttributeSupplier.Builder createAttributes() {
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 425a2cab66ce456b8e034b008d2cb82ecba62004..fee9d1eaadcee7d5bbdacceab5f6e25a30c7e5f2 100644
index 4e3926f190f3d8d2bd27a649496cfa7ca5b47b68..6a4214b6110119215154fee48d000bc1051ea626 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -107,6 +107,11 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -885,7 +885,7 @@ index 8ce46cc00a01a678270e906078097aa717abdc41..51c548cd84bd83624fbff3f853a8050d
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
index 9582332f8fb211b41110d0fcda97521c2035ebb3..90c2e4ccc7191a43722c876c3804a829d98e8713 100644
index 8cf06d7e4537ff93fee4377ad4988e78084ff4a8..29b56001fdb44bc5267d2d2ae8e9bafc61b3fe79 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -140,6 +140,11 @@ public class Slime extends Mob implements Enemy {
@@ -949,7 +949,7 @@ index 5ff3373c9c73691d7f21c05b0f044c198b2bab2d..a7669b3daa4a58a3a6a931de3d86a4fb
public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
index 429c960ef287e71974be5567374e44a44be09c88..e68fbe7cdaefedb1e59d2e96c6e0755180695a27 100644
index dfcaaa245d229328d4227969bf747fd150c02f10..9fefedaa35d8ee63318b8c668f37f57a4ceb20c8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
@@ -110,6 +110,11 @@ public class Vex extends Monster {
@@ -965,7 +965,7 @@ index 429c960ef287e71974be5567374e44a44be09c88..e68fbe7cdaefedb1e59d2e96c6e07551
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
index 729eb8a30b35ef5c70be30b3141b9da5c74388f6..876964a73109bba22584d120fdfd0089bbadc975 100644
index 5308f5d1dd226e2c73df69e729d93bf593ee467d..97657a05a27612d98049681efa6fda8b33a8a989 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
@@ -84,6 +84,11 @@ public class Vindicator extends AbstractIllager {
@@ -1029,7 +1029,7 @@ index 9928af5318c1cc4676c5cf215840ce0f8baf9024..b99419b712b9af385988f1a1271b28f4
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 53513758072a117e2938ba9735b99247abf874d8..14ca49e3bb0942b11e1e8bde14b7d37a61627891 100644
index d47e0050475449cc3e7cf5620b39d16629997d66..436e98e4332def352bb47d51c503a0285fde27fc 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -142,6 +142,11 @@ public class Zombie extends Monster {
@@ -1045,7 +1045,7 @@ index 53513758072a117e2938ba9735b99247abf874d8..14ca49e3bb0942b11e1e8bde14b7d37a
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
index 2ed3df59dbbb811a1b2c13c4a6eff9c602371149..f0905d83cd47ee4dbb076515e2a90c97027ed3e9 100644
index 43b8015579d747b45b5ba8483ab13deffc80ccc2..ac41660b8d3763ff9db320b998480a025ea94740 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -124,6 +124,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -1077,7 +1077,7 @@ index 918cd5c51849e3de4915016a76bbd4b66c3b8b42..202d5da8bd1345d04a98ac6bc9bbc13f
@Override
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 5ac9a41daee27b305a68a91b13a20a1a3f5264ab..dd41783a84876840d8d545bf6b527165b3c5b5ee 100644
index 7a7508dcf15a3cb932944240816d63640aa8be61..10712e3900c57b6d1645472158fe2e818c24af46 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
@@ -97,6 +97,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1093,7 +1093,7 @@ index 5ac9a41daee27b305a68a91b13a20a1a3f5264ab..dd41783a84876840d8d545bf6b527165
@Override
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 a28fad8627e5b95afe2b1ddb320e99f0b57ff158..63b147826766dc12b093196f2f946a473dc24022 100644
index d5388ea5d88b2fb6e6f499e9e7f05f176136d023..a24cf405b5ab298cf1a6f30b09897c235d04e796 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
@@ -121,6 +121,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -1157,7 +1157,7 @@ index 8d6930868a42b9fc98d7672bff433ec50d36999e..53bebecd30fee7613af73901b3aa9961
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bc9acfdb90b6ee2fbb948df98fb0ececfc8fa980..c528e2b9f9bb2879f54658bd459722890b1a215d 100644
index 4943e9c500514036203d870c09f62595ec8c6d73..d28424cc74068904f0a3479789307f9529b03efa 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1021,12 +1021,14 @@ public class PurpurWorldConfig {