Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d714682 Add more entity api (#7564)
PaperMC/Paper@1790528 More projectile API (#5731)
PaperMC/Paper@ea1efef Remove Patches (#7541)
This commit is contained in:
BillyGalbreath
2022-03-11 15:53:15 -06:00
parent f9756e3b9c
commit 67f934ef19
11 changed files with 28 additions and 28 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add enderman and creeper griefing controls
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 a3ac467faac85f3c5a20b6f1cbeeec6d67eb6ac8..0d6bc9dddca21b19835af06f6fd5d4e91f247c6f 100644
index e51bcd5158d17db613311e38f2810b650d522cf4..f486b722ef0c82b449238effc045fa9f68860193 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -349,7 +349,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -18,10 +18,10 @@ index a3ac467faac85f3c5a20b6f1cbeeec6d67eb6ac8..0d6bc9dddca21b19835af06f6fd5d4e9
// CraftBukkit start
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index cd35be1b3bf6056315c901243777115e2e13e5a9..b5fce127d74ac5958758bfa39551e3e1f33cbc85 100644
index 5d2dc22c920c61d4afb7b61c863f2facf8d6ec10..f3ea85978b5714e82b7722d1cf03d136d383824d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -509,6 +509,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -519,6 +519,7 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
public boolean canUse() {
@@ -29,7 +29,7 @@ index cd35be1b3bf6056315c901243777115e2e13e5a9..b5fce127d74ac5958758bfa39551e3e1
return this.enderman.getCarriedBlock() == null ? false : (!this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0);
}
@@ -556,6 +557,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -566,6 +567,7 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
public boolean canUse() {