mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper & Pufferfish)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4e99466 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8874) Pufferfish Changes: pufferfish-gg/Pufferfish@52307ae Updated Upstream (Paper)
This commit is contained in:
@@ -783,7 +783,7 @@ index 0410d56e1aefb4a51b84530ef00ad80b1a598d36..9fbb844b6dfe0ea6580e98e63e21ca9a
|
||||
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
|
||||
playerlist.sendLevelInfo(this, worldserver);
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 7ad67462537d14f4e02cc31d0acdf028ecbfee5a..d6342833b2b7d0ad852e3d1f289574fb029e77c7 100644
|
||||
index 2b6dd8648f902bc166f3d05e52b46c3daac75fb6..a264d2e6c20e48925c9126afea3a956013fa4988 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -405,7 +405,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||||
@@ -1678,10 +1678,10 @@ index 1f9a9f535c54481fc16bec5db4111ca1eba409df..aed1d9ccffe471b6c2a1d52d2d3d097f
|
||||
this.assignProfessionWhenSpawned = false;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
|
||||
index a213f4098859858a73ddd601bbe8c7511972e0d5..c0d39afe5b80159ed9aaca4ddd4763d707882f2e 100644
|
||||
index 5ef6b5ad4dd69a57595914c7af8422ee2f6ad054..de6050c867ac55dd6f0d8243289296781add7157 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/Explosion.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
|
||||
@@ -360,7 +360,7 @@ public class Explosion {
|
||||
@@ -363,7 +363,7 @@ public class Explosion {
|
||||
if (!iblockdata.isAir() && iblockdata.isDestroyable()) { // Paper
|
||||
BlockPos blockposition1 = blockposition.immutable();
|
||||
|
||||
@@ -1690,7 +1690,7 @@ index a213f4098859858a73ddd601bbe8c7511972e0d5..c0d39afe5b80159ed9aaca4ddd4763d7
|
||||
if (block.dropFromExplosion(this)) {
|
||||
Level world = this.level;
|
||||
|
||||
@@ -382,7 +382,7 @@ public class Explosion {
|
||||
@@ -385,7 +385,7 @@ public class Explosion {
|
||||
|
||||
this.level.setBlock(blockposition, Blocks.AIR.defaultBlockState(), 3);
|
||||
block.wasExploded(this.level, blockposition, this);
|
||||
|
||||
Reference in New Issue
Block a user