Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper) (#1174)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7b3b593 [ci skip] Update checkout action in workflow (#8510)
PaperMC/Paper@36869cc Fix new block data in EntityChangeBlockEvent for silverfish when mobGriefing isn't enabled (#8099)
PaperMC/Paper@2432233 Add allow server listing & text filtering client options (#7595)
PaperMC/Paper@954e6f0 Fix a bunch more forceDrops for dropping items (#8095)
PaperMC/Paper@32d95e9 Track projectile source for fireworks from dispensers (#8044)
PaperMC/Paper@0249750 Fix EntityArgument suggestion permissions to align with EntitySelector#checkPermissions (#8511)
PaperMC/Paper@8acb05d Make CommandSyntaxException implement ComponentMessageThrowable (#8513)
PaperMC/Paper@c264018 [ci skip] Undo modification to removed patches in latest commit (#8512)
PaperMC/Paper@304ab35 [ci skip] Remove old todo file
PaperMC/Paper@8a4b752 Fix wrong descriptor in ASMEventExecutorGenerator (#8506)
PaperMC/Paper@b743144 Fix MC-147659 (#8423)
PaperMC/Paper@aaf5e39 Deprecate unused VehicleEntityCollisionEvent methods (#8498)
This commit is contained in:
Krakenied
2022-10-30 06:47:43 +01:00
committed by GitHub
parent 0d5fd505e5
commit fff2015d52
281 changed files with 224 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0008-Ridables.patch
View File

@@ -22,7 +22,7 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 957587f5c3f9c26794c80146b4deb282af3469e8..7f0551e70c545f8e77d18b11e836233faeba9161 100644
index 0eb4a5b18dcaccd37c2b2c71dbc000aeba559a1a..19b9b7deac4d8f125008526cc115375cceced369 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1517,6 +1517,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,7 +34,7 @@ index 957587f5c3f9c26794c80146b4deb282af3469e8..7f0551e70c545f8e77d18b11e836233f
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 0e7dd081befe76e8c589f58e44f1aed76be312e6..a774e9a2ee85a8356fd9d39a8fbe98ff893f8f1f 100644
index 46f7aa594ff43063d9e7066d5015611ba0fa90ea..3de05d160490ed373ee15f8724e9b1a46500f301 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -46,7 +46,7 @@ index 0e7dd081befe76e8c589f58e44f1aed76be312e6..a774e9a2ee85a8356fd9d39a8fbe98ff
final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index bcf056513eae366e47f6db3738a109eed97b320d..ba86728b28b4c1b6fdca7e8734e5967c3873416d 100644
index 9091241c21715e2bbe43a11ba637ec7759e7a43a..c347e5df53355b88bf3f69c0d4e95b48678e95dc 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -674,6 +674,15 @@ public class ServerPlayer extends Player {
@@ -79,7 +79,7 @@ index 42978e1ea82b4d6a740150893518c4f6bd1562eb..f8c0df22fec9ec08d7346c3d872fa53f
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4f1ed7708311d8a8d63706592e9feed8de2a4aa2..7816aae4b7e1745f138cdcc12575eba32de2f562 100644
index 42ae9216debeee149a2074d08d2c96d7c44901a0..2c62bfb41363f1f84c2aa922dde9e56153f1151c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1373,7 +1373,7 @@ index 6a459435493295ee5bb44fe2ba79cba6acea2e35..041c2d330a245826fc2fa4c1327aeadd
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR));
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
index 1494a3d5256f663b17617356d57d2e09aeec6189..46b3f0d26ef95eee43c68fb2829cc99a622d5852 100644
index 87c9f1cba8eac70d54576d6ffb6f85fc5dcb8e8a..8f1b1fbfa76b8003126da7b5a8b5ce1a9cf647df 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
@@ -107,6 +107,32 @@ public class Panda extends Animal {
@@ -1443,7 +1443,7 @@ index 1494a3d5256f663b17617356d57d2e09aeec6189..46b3f0d26ef95eee43c68fb2829cc99a
}
this.tryToSit();
@@ -658,7 +686,7 @@ public class Panda extends Animal {
@@ -660,7 +688,7 @@ public class Panda extends Animal {
return InteractionResult.SUCCESS;
} else {
@@ -1452,7 +1452,7 @@ index 1494a3d5256f663b17617356d57d2e09aeec6189..46b3f0d26ef95eee43c68fb2829cc99a
}
}
@@ -698,7 +726,7 @@ public class Panda extends Animal {
@@ -700,7 +728,7 @@ public class Panda extends Animal {
return !this.isOnBack() && !this.isScared() && !this.isEating() && !this.isRolling() && !this.isSitting();
}
@@ -1461,7 +1461,7 @@ index 1494a3d5256f663b17617356d57d2e09aeec6189..46b3f0d26ef95eee43c68fb2829cc99a
private final Panda panda;
@@ -708,9 +736,9 @@ public class Panda extends Animal {
@@ -710,9 +738,9 @@ public class Panda extends Animal {
}
@Override
@@ -2067,7 +2067,7 @@ index 559a4995d3530c0d402ab6306f9ac4c46b934c2b..cac2845978b9beebb4e1ed6fed3eb33a
return "entity.minecraft.tropical_fish.predefined." + variant;
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index 5575730aa6f77a91467c394fa8465c335d73db8e..b185a58c0adb9a0dde014dd7fdeb3bd465feb706 100644
index 4764b975386f1c5629a59f762f7ba1c1ae2598c5..ec095421e4928489a4bebfbb212f1795b57341fc 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -82,6 +82,23 @@ public class Turtle extends Animal {
@@ -4183,7 +4183,7 @@ index 524eed4042c7a83eb8b4a0769a66330dd141261d..7db7e4ae2ad164dd622ab9b803a5e395
public ShulkerLookControl(Mob entity) {
super(entity);
diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
index 2dcda3b03796655da443e1b3dd68c6f6bca20d21..5f1f9ecb06555f15a464efa27f06a5dbdd255c1e 100644
index 37d3b670a93c26b87ffc5c93ad7828f45b4b0217..07b134957b0d53841f2d4462f91fcf20fb9006fd 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
@@ -42,14 +42,33 @@ public class Silverfish extends Monster {