Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 18:28:15 +02: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@d8d59e0 Fix NPE sending resource pack without prompt
PaperMC/Paper@5a9afbe Fixes issues in the suppress dismount cancellation patch (#10735)
PaperMC/Paper@0ad09de Make PaperSimplePluginClassLoader show class which is not found
This commit is contained in:
granny
2024-05-19 15:11:01 -07:00
parent 9dcfdf13c2
commit 88aa731cf3
14 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0006-Ridables.patch
View File

@@ -46,7 +46,7 @@ index ca56a0b596976448da6bb2a0e82b3d5cd4133e12..6247659f33c3d21d33ec1f5105234036
public LevelChunk getChunkIfLoaded(int x, int z) {
return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f587958d2b907f7fcd819dbb6db7e42232754567..4391ae896d8dbe98c6577f85759b187a396a7c21 100644
index 0f8c2ff5e2d0d396e85e26e0a03a761e9bb25654..c1d6a2c82e240a7c50b4cb973c285b816f7ec419 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -814,6 +814,15 @@ public class ServerPlayer extends Player {
@@ -79,7 +79,7 @@ index b9b3277c8ed94e0cd30b20b9c00a33eaad48e5ac..647026afdb161e21ff55dc9a3d470eef
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)) {
entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6c7f80723d67baf0ca036e0a12c3007144352edf..9c99a3df80c5f0a0d81e1f6a6516d088438a0b1e 100644
index 95c88ac0142551fbcfd2356be2fc70f7a78278ab..973e4c24a53fecad99fa5740c9c3cedd1320821b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -381,7 +381,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -91,7 +91,7 @@ index 6c7f80723d67baf0ca036e0a12c3007144352edf..9c99a3df80c5f0a0d81e1f6a6516d088
private float eyeHeight;
public boolean isInPowderSnow;
public boolean wasInPowderSnow;
@@ -3080,6 +3080,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3086,6 +3086,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.passengers = ImmutableList.copyOf(list);
}
@@ -105,7 +105,7 @@ index 6c7f80723d67baf0ca036e0a12c3007144352edf..9c99a3df80c5f0a0d81e1f6a6516d088
this.gameEvent(GameEvent.ENTITY_MOUNT, passenger);
}
}
@@ -3119,6 +3126,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3125,6 +3132,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return false;
}
// CraftBukkit end
@@ -120,7 +120,7 @@ index 6c7f80723d67baf0ca036e0a12c3007144352edf..9c99a3df80c5f0a0d81e1f6a6516d088
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -5009,4 +5024,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -5015,4 +5030,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end - Expose entity id counter
@@ -190,7 +190,7 @@ index 09fdea983772612ef3fff6b2da3cf469a34e4ec0..aa76a24421cdb3908a3544d92eb3d1e3
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 517e10c3d8b1549cd30fd0e7cf2bcb35e88eb8ed..961c4addedd288758ac91b5144571d054f6069ac 100644
index ef0f118aecf0893e45cb9423a677d7e42496324b..593db87486031d6e21b574a755b16bf6f5c5bf95 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -229,9 +229,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -4034,7 +4034,7 @@ index 2d7b7c949faaaaae94c0043132a4a822f55df104..1248a48c0146258d14efcaa805a82ce1
this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.0D);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
index 5215fa54666979ef4da074ddfdb082e7274f2957..78433d0b7624019018012c55e8dd6fec029f8cd1 100644
index e03119f88719c8d6d44793a6b3706ae97b2da307..803a5c71f7712ac004990419131757d17ad685bf 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -97,12 +97,31 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -4069,7 +4069,7 @@ index 5215fa54666979ef4da074ddfdb082e7274f2957..78433d0b7624019018012c55e8dd6fec
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{this.getClass()})).setAlertOthers());
this.targetSelector.addGoal(2, new Shulker.ShulkerNearestAttackGoal(this));
this.targetSelector.addGoal(3, new Shulker.ShulkerDefenseAttackGoal(this));
@@ -602,7 +621,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -608,7 +627,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
return b0 != 16 && b0 <= 15 ? DyeColor.byId(b0) : null;
}
@@ -5003,7 +5003,7 @@ index 0854e9b7ee2e6b23b6c1ee6a324a5a253c9d4679..6bdf3d1e3652a661282d61f1dc2bfc27
this.setTradingPlayer(player);
this.openTradingScreen(player, this.getDisplayName(), 1);
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 093d1388ff90ad59110a37536b6639f939549068..66753bffa1e21ac5d5aaab4bc6cccb833774ddf5 100644
index 686374e89e41b0917791264f3281f7384835bca8..1f2ba90a5418d6b4367ebce0f498ebdd204e5b18 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -206,6 +206,19 @@ public abstract class Player extends LivingEntity {