Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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@b14979e Remove isRemoved skip on .discard() (#9520)
PaperMC/Paper@1837f6c Prevent entity removals if the entity slices is receiving status updates
PaperMC/Paper@a40e48f Add cause to PlayerOpenSignEvent (#9441)
This commit is contained in:
granny
2023-07-26 12:43:35 -07:00
parent 7cefa0cafa
commit 9dab7fe5f1
14 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/server/0271-Remove-Mojang-Profiler.patch
View File

@@ -819,7 +819,7 @@ index c8c43454a936dd04d71fd82c955191f709a6c010..3ab54ab8d0a5ccf1abaa53cf3ce5b25f
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 c43bfea788d1d019655631af8dc6c31effcbd23d..6d9205e34d237811788d487469e5e60bf977a3e0 100644
index 47728d0b6903a7f5a78f43da28fbd55c3f515ceb..07fc2b5f8ecc3c72d13eff5d9aef08df39ecd251 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -410,7 +410,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1045,7 +1045,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d7147fa63777 100644
index da29c1f7727c0098a79603785ca648296f0fb963..2680aeabddc2dabc2c92e187149a567a842cada1 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -438,7 +438,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1057,7 +1057,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
public float getBukkitYaw() {
return this.yRot;
}
@@ -863,7 +863,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -862,7 +862,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
public void baseTick() {
@@ -1066,7 +1066,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
this.feetBlockState = null;
if (this.isPassenger() && this.getVehicle().isRemoved()) {
@@ -924,7 +924,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -923,7 +923,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.firstTick = false;
@@ -1075,7 +1075,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
}
public void setSharedFlagOnFire(boolean onFire) {
@@ -1143,7 +1143,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1142,7 +1142,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
}
@@ -1084,7 +1084,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -1152,7 +1152,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1151,7 +1151,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// Paper start - ignore movement changes while inactive.
if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
setDeltaMovement(Vec3.ZERO);
@@ -1093,7 +1093,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
return;
}
// Paper end
@@ -1173,8 +1173,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1172,8 +1172,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
}
@@ -1104,7 +1104,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
boolean flag = !Mth.equal(movement.x, vec3d1.x);
boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
@@ -1193,7 +1193,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1192,7 +1192,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
if (this.isRemoved()) {
@@ -1113,7 +1113,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
} else {
if (this.horizontalCollision) {
Vec3 vec3d2 = this.getDeltaMovement();
@@ -1331,7 +1331,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1330,7 +1330,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.setRemainingFireTicks(-this.getFireImmuneTicks());
}
@@ -1122,7 +1122,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
}
}
// Paper start - detailed watchdog information
@@ -3100,7 +3100,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3099,7 +3099,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1131,7 +1131,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
this.portalTime = i;
// Paper start
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);
@@ -3118,7 +3118,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3117,7 +3117,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
} // Paper
// CraftBukkit end
@@ -1140,7 +1140,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
}
this.isInsidePortal = false;
@@ -3589,14 +3589,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3588,14 +3588,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
// Paper end
if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -1157,7 +1157,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
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) {
@@ -3630,7 +3630,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3629,7 +3629,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.unRide();
// CraftBukkit end
@@ -1166,7 +1166,7 @@ index aeacaf0e2567290930d4a0bb364e4e7d316a80d7..5cded930e23e881b2e02ed2456b1d714
// Paper start - Change lead drop timing to prevent dupe
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3653,10 +3653,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3652,10 +3652,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.removeAfterChangingDimensions();