Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01: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@a7ae966 readd itemstack data sanitization (#10454)
PaperMC/Paper@ca50b87 Clear firework item properly (#10793)
PaperMC/Paper@9774a52 fix and cleanup loot table patches (#10100)
PaperMC/Paper@ac4ee06 Fix integer overflow for lag compensating eating check (#10797)
PaperMC/Paper@6649a17 Fix BlockStateMeta equals (#10795)
PaperMC/Paper@1b8cdc6 Extend Player Interact cancellation to cover Jigsaw blocks (#10719)
PaperMC/Paper@841ab41 Fix more item desync when an event is cancelled (#10654)
PaperMC/Paper@b0e3ca4 Prevent NPE if hooked entity was cleared (#10712)
PaperMC/Paper@347bbe3 Fix Cancelling BlockPlaceEvent calling onRemove (#10773)
This commit is contained in:
granny
2024-05-26 17:12:40 -07:00
parent 22fc5f9bda
commit 2842b97ddf
38 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
patches/server/0255-Remove-Mojang-Profiler.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Mojang Profiler
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 9a91a29614823e10f59aeaa156d85f7229bfb497..5c048dc779b29c4903dc63daa8a1f9bf54270ba1 100644
index 157a8cd3599a196f1c12f56ad4c5aa68898a1960..5e846fe5b1b13abf10d3d36c2a78472dc2bd0e42 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -166,7 +166,7 @@ public class Commands {
@@ -826,10 +826,10 @@ index b727c707ef46a9387fc225b51ef050c6baff1c74..7924e3c597164f71056cd58dd167ee8b
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d3d6febb1942b59e6e0e90259acdef22d344a853..12d55da2cd14a497effe16f5d33b5bcba6cb22c1 100644
index a5566e52d839191add236a6ff7245d1b7617fc37..375d1532d267f4fbc735eede99eddc6f7f25103c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1317,7 +1317,7 @@ public class ServerPlayer extends Player {
@@ -1318,7 +1318,7 @@ public class ServerPlayer extends Player {
PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
if (shapedetectorshape != null) {
@@ -838,7 +838,7 @@ index d3d6febb1942b59e6e0e90259acdef22d344a853..12d55da2cd14a497effe16f5d33b5bcb
worldserver = shapedetectorshape.world; // CraftBukkit
if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
@@ -1340,8 +1340,8 @@ public class ServerPlayer extends Player {
@@ -1341,8 +1341,8 @@ public class ServerPlayer extends Player {
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@@ -849,7 +849,7 @@ index d3d6febb1942b59e6e0e90259acdef22d344a853..12d55da2cd14a497effe16f5d33b5bcb
if (true) { // CraftBukkit
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -1359,7 +1359,7 @@ public class ServerPlayer extends Player {
@@ -1360,7 +1360,7 @@ public class ServerPlayer extends Player {
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
worldserver.addDuringPortalTeleport(this);
@@ -1085,10 +1085,10 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b403dcc68c 100644
index 13f69b9ceb082a013dfe2de2d5807dde77d53a2f..57aa9f71a3b27073f3e229ecd342c52546d151b3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -897,7 +897,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -896,7 +896,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// CraftBukkit end
public void baseTick() {
@@ -1097,7 +1097,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Prevent entity loading causing async lookups
this.inBlockState = null;
if (this.isPassenger() && this.getVehicle().isRemoved()) {
@@ -958,7 +958,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -957,7 +957,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.firstTick = false;
@@ -1106,7 +1106,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
}
public void setSharedFlagOnFire(boolean onFire) {
@@ -1175,7 +1175,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1174,7 +1174,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
@@ -1115,7 +1115,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -1184,7 +1184,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1183,7 +1183,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// Paper start - ignore movement changes while inactive.
if (isTemporarilyActive && !(this instanceof ItemEntity) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
setDeltaMovement(Vec3.ZERO);
@@ -1124,7 +1124,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
return;
}
// Paper end
@@ -1205,8 +1205,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1204,8 +1204,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
}
@@ -1135,7 +1135,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
boolean flag = !Mth.equal(movement.x, vec3d1.x);
boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
@@ -1225,7 +1225,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1224,7 +1224,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
if (this.isRemoved()) {
@@ -1144,7 +1144,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
} else {
if (this.horizontalCollision) {
Vec3 vec3d2 = this.getDeltaMovement();
@@ -1363,7 +1363,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1362,7 +1362,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.setRemainingFireTicks(-this.getFireImmuneTicks());
}
@@ -1153,7 +1153,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
}
}
// Paper start - detailed watchdog information
@@ -3264,7 +3264,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3263,7 +3263,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1162,7 +1162,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
this.portalTime = i;
// Paper start - Add EntityPortalReadyEvent
io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
@@ -3282,7 +3282,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3281,7 +3281,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
} // Paper - Add EntityPortalReadyEvent
// CraftBukkit end
@@ -1171,7 +1171,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
}
this.isInsidePortal = false;
@@ -3742,14 +3742,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3741,14 +3741,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
// Paper end - Fix item duplication and teleport issues
if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -1188,7 +1188,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) {
@@ -3788,7 +3788,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3787,7 +3787,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.unRide();
// CraftBukkit end
@@ -1197,7 +1197,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
// Paper start - Fix item duplication and teleport issues
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3815,10 +3815,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3814,10 +3814,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.removeAfterChangingDimensions();
@@ -1211,7 +1211,7 @@ index 81c10d07d28e5158e0f248e02939f562fa20d65c..597c8934264d4d541494e7ce2375a0b4
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 93670b0ca36eed241075168e5724fcffb14e83e3..7c020efc033ecdd0582ba972063d6de486699498 100644
index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199dbf71212f8 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1322,7 +1322,7 @@ index 93670b0ca36eed241075168e5724fcffb14e83e3..7c020efc033ecdd0582ba972063d6de4
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index ee98efa69d67cd22eb5722cf68f3b7063e2595c8..56da8a4600688efd1987d82d4fcad1757e33f4f2 100644
index 9d532c373ca1762ad48b9b81000d2c11b929d220..429d8b09496d7d6ffc5f44dca953d6194683813b 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -376,13 +376,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -1645,7 +1645,7 @@ index b98a34357e59168bbb22c967b86a449fc91f47f0..09c4cf772df4644413e40055fedcdf42
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index 79c27b5717fec000ea94138ebc76dbabf5b2eeaf..4e855055abe4d300b6b126e8a9deecaab5827a33 100644
index fab01a3e779e39962ef04305540e2fe3043072a2..4feddea8703d25a671fe11617f99e1fa9c1deaa2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -224,13 +224,13 @@ public class Goat extends Animal {
@@ -1834,10 +1834,10 @@ index 082b804f4793f72e76361f5427f0358273454b3d..bd5fcb028d41b60de183b4d849f1ba10
if (this.fire) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 90313f228944cc37f6af5ff5fcc679f423a26d14..487bb3e75afc5871a79506a54f0f4af806460b14 100644
index a09e27a34631b779ca0170da7abc0bcb2559c5d2..4beada452d014ec7dc7c167466ec2af3c5bfcd33 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1294,9 +1294,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1295,9 +1295,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
protected void tickBlockEntities() {
@@ -1849,7 +1849,7 @@ index 90313f228944cc37f6af5ff5fcc679f423a26d14..487bb3e75afc5871a79506a54f0f4af8
//this.timings.tileEntityPending.startTiming(); // Spigot // Purpur
this.tickingBlockEntities = true;
if (!this.pendingBlockEntityTickers.isEmpty()) {
@@ -1337,7 +1337,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1338,7 +1338,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
//this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur
this.tickingBlockEntities = false;
co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
@@ -1858,7 +1858,7 @@ index 90313f228944cc37f6af5ff5fcc679f423a26d14..487bb3e75afc5871a79506a54f0f4af8
this.spigotConfig.currentPrimedTnt = 0; // Spigot
}
@@ -1552,7 +1552,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1553,7 +1553,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@Override
public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1867,7 +1867,7 @@ index 90313f228944cc37f6af5ff5fcc679f423a26d14..487bb3e75afc5871a79506a54f0f4af8
List<Entity> list = Lists.newArrayList();
((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
return list;
@@ -1571,7 +1571,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1572,7 +1572,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -1876,7 +1876,7 @@ index 90313f228944cc37f6af5ff5fcc679f423a26d14..487bb3e75afc5871a79506a54f0f4af8
// Paper start - optimise this call
//TODO use limit
if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
@@ -1826,6 +1826,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1827,6 +1827,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {
@@ -1907,7 +1907,7 @@ index 2812505185df691e8f08932aa0bba162a7d9db86..35e94c06361795d032f995e8282f8b35
// Paper start - Add mobcaps commands
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index e8d14bf4120dd9861e4ccb8bd6c14e175343c55d..fd637415625fdabcac07e120e9168d09c06141d4 100644
index a9ed6255be8505cb8d067dbf8f665aacda618716..8fea185d3b7213dfef3c94ab7cc38bd008c38d29 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -443,11 +443,11 @@ public class LevelChunk extends ChunkAccess {