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

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 07:12:26 -04:00
parent 9ab5b07c78
commit 4b168c7792
41 changed files with 253 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/server/0239-Mobs-always-drop-experience.patch
View File

@@ -149,7 +149,7 @@ index 8e04d20c0f1038dbe1c8e7f05242f66e95ec5a38..66749befa2e6d766d80224b507e1acef
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
index ebcc5527e1df12dfc682a5558f1e8a2da13d8216..7f8bb43f6d2ace9ef277ecd52975a7fa4f895d37 100644
index 98a68e759d7b23da78dd2ec6bcb1aa12dab3ad2c..0292690b9c99f66210a03817e512c65ca65bc749 100644
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
@@ -104,6 +104,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
@@ -277,7 +277,7 @@ index 2a9af6af653dc62c99baff01ebea8ad64ff62fe0..bf9e6b6ca2b2bf8b2a2e96d10cd4fda9
@Override
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 cc780b3e4649549c746fc6127fc85c387a6be370..9656320e3d53fb7474e40762f497ead3997959b0 100644
index 8706b15afa5630c94a5568d6a0644edf2ba12ff5..e6b36650d1c670dbb3ccb0657f43432e64166e29 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 {
@@ -437,7 +437,7 @@ index 327a2161ba4b400952f104113015cbb630d1950d..b8ec588e021a33fa2a41b583605603c0
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
index c888516a1e4b7283fdb2cb15bc9a13900e901e53..645ff6433a299ef3ad8b2ea37c6c46e60a610d48 100644
index e64dec4560331d34f3c2885f50d716744e90f5df..6d9a91bbb53e748f0fe88318da23c19c6755ca9a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
@@ -45,6 +45,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -453,7 +453,7 @@ index c888516a1e4b7283fdb2cb15bc9a13900e901e53..645ff6433a299ef3ad8b2ea37c6c46e6
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
index 6ae27ba8e40c490e8ae58d8f78f071a9e18d980e..939e8c0850f1f460808c82109364a022db46c54a 100644
index 704e08b1ad0601e9b7f3b355214a820858a421ce..d0b477c01386ce25bf4a93bda8561c7ecb05f70c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
@@ -70,6 +70,11 @@ public class Horse extends AbstractHorse {
@@ -469,7 +469,7 @@ index 6ae27ba8e40c490e8ae58d8f78f071a9e18d980e..939e8c0850f1f460808c82109364a022
@Override
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 5506acea9b84a42eff7bdd593fec69c5031363b6..5fdd5588f13efade75ed1bd2ff3ca346ed8b3b94 100644
index b7b8d7587018759fc418043694abd38fd043852b..9bbb756e5da3d0967e5beb026996775e272b10e4 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
@@ -141,6 +141,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -485,7 +485,7 @@ index 5506acea9b84a42eff7bdd593fec69c5031363b6..5fdd5588f13efade75ed1bd2ff3ca346
public boolean isTraderLlama() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
index 610282c7be7355f0800c1265cc8b19dd557d065a..7c52b316c24c8cf55bf4a68337dd70515b270a1a 100644
index aa78c4512de01229bdc5fcdc30e7ac992c96ea07..00337bd1c529b31c539ca23f52551ce47288f679 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
@@ -44,6 +44,11 @@ public class Mule extends AbstractChestedHorse {
@@ -501,7 +501,7 @@ index 610282c7be7355f0800c1265cc8b19dd557d065a..7c52b316c24c8cf55bf4a68337dd7051
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
index 345cb3eca7663b34eb847b04491ad343d06c2eb8..6ab7dc16671ac26a73c96d1c1b941b5e05f21cba 100644
index dc8e892673b9ce137c2d4236c4ed4e843922438b..362ac48c22a21d3473a7726f8e6ff9712afecaec 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
@@ -60,6 +60,11 @@ public class SkeletonHorse extends AbstractHorse {
@@ -517,7 +517,7 @@ index 345cb3eca7663b34eb847b04491ad343d06c2eb8..6ab7dc16671ac26a73c96d1c1b941b5e
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
index b3d9ab9c40fff58cdcb64e1499ee70d5442d121d..4e2fa045449783824adeeeca260c83ae81abd9f4 100644
index 44f7d38ae3de0210f62477474afdc314e5c7054a..ce01246a03a0319670b3fd34499db67c5dc11dc5 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
@@ -72,6 +72,11 @@ public class TraderLlama extends Llama {
@@ -533,7 +533,7 @@ index b3d9ab9c40fff58cdcb64e1499ee70d5442d121d..4e2fa045449783824adeeeca260c83ae
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
index 0f76bcb56c03bc2743f7f36217c2442adf07d2a3..60f72f023fcfc15c9f092e955055ab5089e27cf5 100644
index 6d1938f1cbad394f218b36ec8958d5e7ba6623f7..215c2a75fc53e558a5d804055138ee0fdb494965 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
@@ -58,6 +58,11 @@ public class ZombieHorse extends AbstractHorse {
@@ -549,7 +549,7 @@ index 0f76bcb56c03bc2743f7f36217c2442adf07d2a3..60f72f023fcfc15c9f092e955055ab50
public static AttributeSupplier.Builder createAttributes() {
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 93b5df1b561a89ee2f7826662e70106cfbd1d271..1974e68cd9d00bdbabe7778c8e140d7f20f3bb6a 100644
index ebaf3945f30c45a0c4d0844ca7bf7a803cc636a7..3afe99e22854aaf50b48256d7f9b83bed12cad2e 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
@@ -237,6 +237,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -597,7 +597,7 @@ index 5347ba12f2a07601c9f044081e5e6ce6472c4a2a..0ac5264a16c9121c0f6233e83c426199
@Override
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 09d41e2adef76a4d3fb68b3a3002572144c9044c..4e5dc1e30f981a6bc33344a18af56a09ac5d6230 100644
index b19e130b56839c261dd71bbf62b052ede5fb7227..fb342992e6033bcd001faf7e0bf9c0faa1698034 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -165,6 +165,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -709,7 +709,7 @@ index 8ab5dfd2f56d52b275bf160d8a28adce5564a5f2..225a4e549c2cbf64beaba52d26b196af
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
index dd7ad09e8b154347290126fe8f7e195c1b348ec9..5cd408392e8afbbb58a4b808af92631c59ab9339 100644
index 148ad9bc34793e6ed2b4b02aff6f239321504268..2511ca42039fa91483a316ae13bb7da54f312f13 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
@@ -112,6 +112,11 @@ public class Giant extends Monster {
@@ -789,7 +789,7 @@ index 5311b26e56eac2a854e615a3e694eadd9520cc1c..2111a99d23d86f5f2e2ce8101dbbf292
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index 42919b2267eed71e29830a96afdd3be19d6b6f68..bc5d6300c2e5f6cf8fbad73096e8a6e5d279a873 100644
index 836ca1a47524088c78c6c72a9479c7ffabfbee10..33b347474b7485633ca77bdff28e4b32580b51b8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -157,6 +157,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -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 b069ec2f52956d1e2744fe3831567cdf85ff66c1..a4489d241031632513a81d32af394d9eba9bec11 100644
index 8f8ac9e39ec046b86843099d2daefc4f67c62b72..b808e03311f22045a2a59b86dc28592143acf8e6 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -139,6 +139,11 @@ public class Slime extends Mob implements Enemy {
@@ -901,7 +901,7 @@ index b069ec2f52956d1e2744fe3831567cdf85ff66c1..a4489d241031632513a81d32af394d9e
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
index 39b6c3ea2aa955b1005edfd80e1c4913315bd621..194b6a976e032ddf3e4cbdffdd68dbb9a48ec720 100644
index 12e25f1cf9daeecd46788959227910b328091a43..bdd4fc3072f7a5ea504ba35f6a08ae971e83b69f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
@@ -76,6 +76,11 @@ public class Spider extends Monster {
@@ -965,7 +965,7 @@ index 1e4f227ad895f2099d889c3b9317176449675af1..a30440eb53dc909c7c02137dc041df06
@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 9cb7983b911dd3ec260df9fc05651ed2de93205c..d37a2fc76ade824a9e378216c5084efac9a4083d 100644
index b9b2e76535da32965615de563d4674cee4abd7f0..efbfe0a151686f00051026113c4d1f4d9c9eb241 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
@@ -83,6 +83,11 @@ public class Vindicator extends AbstractIllager {
@@ -997,7 +997,7 @@ index 801355c7c3a4acfb3c45b0d5bc3218e948f72e10..7a59a1834cf07933215bdee56dda9a94
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
index 81cc7a0707f8e4a8b7272543e0d9c45c5d58b897..624f0fd9b04fa9fc76cc3b3461dc59497258071b 100644
index dd47abc25f71ad019025e11bdf9f5ca97c2c78f3..56f1c52afe32ce71edd44c7bc3ff1ac1f09457a2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
@@ -60,6 +60,11 @@ public class WitherSkeleton extends AbstractSkeleton {
@@ -1029,10 +1029,10 @@ 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 5b91419948b8c08805fdf9c8bb70fd98eaa2ca7c..b792c90963d5b4df4ca400c181ee85e55005e84e 100644
index 5b7a6fa9692933ceb40c36e2c684a98d2ba51d57..177bc2b03d2f103add8e8d8ff862c8fe48c4ef6b 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 {
@@ -143,6 +143,11 @@ public class Zombie extends Monster {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.zombieTakeDamageFromWater;
}
@@ -1125,7 +1125,7 @@ index a44f9a59fbec146df95d89c26df12efb79f6179a..760015f7a98e70b735707c77472c084d
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 c8a82fd10cadc27f394a7cde646a5a2e9eb39371..05fb8c7f968b736c8430ab2ea56900c14485b10b 100644
index dba831d07a2be3dd79a9b8f0862faca85a37b171..ffd03c6955ba94af097d2937b74c5862b12e82f2 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -191,6 +191,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler