Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172)
PaperMC/Paper@5deafd1 Teleportation API (#6562)
This commit is contained in:
BillyGalbreath
2022-07-22 16:44:39 -05:00
parent 028780d4e1
commit 9a15789561
27 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ index 007c945725721ddb8a3dc4b8085e8c68da741b93..53ef2004d1b6acaf27fef9a658fff99b
@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 eaff4f966b4d82749df9e96246c078301fd4801b..2cea3d633209665d0cab2b211b817e3bbd61d3a2 100644
index fa71241df0b291fedf7ff0a70dc9dc375f65b8a8..cf2515ecea8bb2fefaf025977a705d9545f85e21 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -176,7 +176,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -641,7 +641,7 @@ index 6acdd443e1e9d59efab8966f5f3ddbfb7be72336..fa4d5579dcdaad04fa2e6cd9ae47af11
@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 1d57ee963416e784a759f2ecee7b7c380f0597eb..037d77b47d0be69dfeda01f4a0d52ad72aea2c8d 100644
index dbf1c0704788136f4f8a893460f57ba6d3f42780..8e7e94779f034e036110365f4200540a89910fd0 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
@@ -108,6 +108,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -855,7 +855,7 @@ index 13c0c270dc56f0e3d6e60714a3b9abeb6413c74f..d2dc2b73692ddf28272b1196a6ed718f
@Override
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 02b0c732b17f8992c040f095c410d526e1faa62a..14b2d1adabcdf9281f314e3cd185ea22353e614e 100644
index 570b3cbfc66f762999eaec57109ec11c995707b2..ca14d2702f6a4b5c1be2a24a146723232a2d19ef 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -95,6 +95,11 @@ public class Ravager extends Raider {
@@ -1021,10 +1021,10 @@ index 021550a0465dd1fd152b4c2e763014058730e8ca..b9b2e76535da32965615de563d4674ce
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
index 0359db7ccca286df046066b4a2356a50b8240a56..801355c7c3a4acfb3c45b0d5bc3218e948f72e10 100644
index c4ee1bca68b26403b6671c8c5f7fc3f037ad1128..e6a3da524b8d6f776d541d1ae46f572c4f12d785 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
@@ -79,6 +79,11 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -76,6 +76,11 @@ public class Witch extends Raider implements RangedAttackMob {
public void initAttributes() {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.witchMaxHealth);
}