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)

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

12
patches/server/0138-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -117,10 +117,10 @@ index b063a74327e51b3cd27427426b92ef687c59c94b..00eec3f51e62858e7b85b3340e76bf66
@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 3b198ad456f666fa1819ac39bcdfc8c85a256708..2dba75b221022b1f6d0d68813c992bc796d499c5 100644
index 9ad944839ec143375414fc3e054a2f8cc16814cd..3873fe82ec05f84efadd28ee9f48831b95405de2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -158,6 +158,11 @@ public class Dolphin extends WaterAnimal {
@@ -164,6 +164,11 @@ public class Dolphin extends WaterAnimal {
public void initAttributes() {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.dolphinMaxHealth);
}
@@ -402,10 +402,10 @@ index 0ded0de33fb53d827f2cdbfa5472c3469ee5a329..8c4ef7de3dfa2888ea175342a8df308a
@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 a83139c75968abe7c62d6aec7e18cd010f9d447c..ad5d46c85c64e03b89a7fff452fa276ad9dcd255 100644
index ea1fba058b28631a85dd5ec6153620d67c4ca5f2..dc84d044aa7533d31c48ed80e49c44951320cb5e 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
@@ -121,6 +121,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -127,6 +127,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
public int getPurpurBreedTime() {
return this.level.purpurConfig.axolotlBreedingTicks;
}
@@ -684,10 +684,10 @@ index 6d47413b56b9d8b195b6087e39048b6ad5ce477f..35108f25aac196b2c8ba2cf91a674483
@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 29efe3092338dfbd6712ddf47fc34595eb0c9552..1cc0ea14210c35392a722b05dcf1a5c25e7b5cf0 100644
index f64f61e189baab82eb93891313106cc2d8edc8d3..6c3af9c64f9622150928da09ce8318c21d450b74 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
@@ -67,6 +67,11 @@ public class Evoker extends SpellcasterIllager {
@@ -68,6 +68,11 @@ public class Evoker extends SpellcasterIllager {
public void initAttributes() {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.evokerMaxHealth);
}