Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,10 +117,10 @@ index 90e48fed68fab8e5e9f43bbeffd3a42a2ee51807..1c112e79a97648219022dc4586bfa520
@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 8a5230611e4a9835f1b8b21cf09a7054da76feb9..57cbdf3c0493f11f7f13d0bcb74b3b30252d81a8 100644
index 7e424c7674e6e8f1db42bbdfbb230174f885a07d..c809ea41cf585f4adba1772043626a462f280c9a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -164,6 +164,11 @@ public class Dolphin extends WaterAnimal {
@@ -170,6 +170,11 @@ public class Dolphin extends WaterAnimal {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.dolphinTakeDamageFromWater;
}
@@ -405,10 +405,10 @@ index 63d3f68326386532b027c077c35629c75508bfc4..f3ff018e61eb89d581744d5dfae00f4d
@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 ad5d46c85c64e03b89a7fff452fa276ad9dcd255..23574a0ff9015c4a95b02e5ca83a4395abca3be0 100644
index dc84d044aa7533d31c48ed80e49c44951320cb5e..b3f2bd60cd52a51e04cf92da321d247f1d2c7c7b 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
@@ -126,6 +126,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -132,6 +132,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.axolotlTakeDamageFromWater;
}
@@ -677,10 +677,10 @@ index 3e0f287695fd3def8ed9967d921e141b7ff8bc47..faf16f91cfa689f2bb56fd9ac91aae76
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
index 1cc0ea14210c35392a722b05dcf1a5c25e7b5cf0..2302690385bd72e9b03fa878b83023731666adf8 100644
index 6c3af9c64f9622150928da09ce8318c21d450b74..396dc17d26475db9037ec0ec2f72dd0750fed43d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
@@ -72,6 +72,11 @@ public class Evoker extends SpellcasterIllager {
@@ -73,6 +73,11 @@ public class Evoker extends SpellcasterIllager {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.evokerTakeDamageFromWater;
}
@@ -1157,7 +1157,7 @@ index f3994e53af79a4c3bb327e43cf133a12c20662bf..2acf9de429b75acfe5953628ca503260
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9e255728e5d8602db3600bf4759266d8de253380..b030105bea31453a4cfd978c16d228ff3795f871 100644
index d609aa408d7b72af9fbef74072844652b8b01d20..ec72a6f07685d5401aa2a10618ec9649e048bc00 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 {