Updated Upstream (Paper)

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

View File

@@ -37,7 +37,7 @@ index a851aaf84085c9bd79e933246bb2c79e435ab0f1..1436f9f62ce20b39c5ae2425c2fe47f5
@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 a7189aff3d36efaee2c41336361960d3c9fa6f72..c3680aa6d92b0adb104d144875cea679084e36f2 100644
index 457827e79e776c5d029fb0b603c237232364d636..85f07b0a10ab1f02befc5065d898a7dbf8d37ef4 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -229,6 +229,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -613,7 +613,7 @@ index b19e130b56839c261dd71bbf62b052ede5fb7227..fb342992e6033bcd001faf7e0bf9c0fa
@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 6e0a575a95ac0bcbc9e3909178ea566a158dd561..68e31cf561f3d76bce6fa4324a75594c776f8964 100644
index c9665576a658d0e996c788ceb12fd26ab786f9bc..3c841029197eeca960f033acf7d450145e72e0bd 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
@@ -114,6 +114,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -821,7 +821,7 @@ index d2dc2b73692ddf28272b1196a6ed718f2f14e116..ce123b46723ceeadb7751f7998ac01eb
@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 1c821c354184a57d54a2976e5e00eb9ed0cefb72..98daeeb7545217347522a5edeef9178dcab62acf 100644
index 1ca7058e59e42d58c5a670021f74546acf76ca36..ccf219587461224a027b567b6f05c73711009c14 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -100,6 +100,11 @@ public class Ravager extends Raider {
@@ -981,10 +981,10 @@ index b9b2e76535da32965615de563d4674cee4abd7f0..efbfe0a151686f00051026113c4d1f4d
@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 801355c7c3a4acfb3c45b0d5bc3218e948f72e10..7a59a1834cf07933215bdee56dda9a94ddd8bd85 100644
index e6a3da524b8d6f776d541d1ae46f572c4f12d785..d308c2bed67977bd6fd2a4509f9a13ae2af9025f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
@@ -84,6 +84,11 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -81,6 +81,11 @@ public class Witch extends Raider implements RangedAttackMob {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.witchTakeDamageFromWater;
}