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@e16fefb [ci skip] add 'accepted' to Done project category (#9429)
PaperMC/Paper@171ba7c Move Log4j plugins to own source set (#9428)
PaperMC/Paper@4356758 Call missing BlockDispenseEvents (#8518)
PaperMC/Paper@c0936a7 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
PaperMC/Paper@12c9700 Fix ThrownEggHatchEvent#setHatching (#9448)
This commit is contained in:
granny
2023-07-05 20:32:26 -07:00
parent ab2f1c06ce
commit b21daa9622
105 changed files with 679 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/server/0272-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 13f07c874cdf9a8063ce8f72d2402d27e6a1e7e5..4ad3916e687f9f7aa7fb6fe7bb45f236ac20b810 100644
index 6eb223cc49a7409b94806255118a3bf04aea6d9e..84c4d7525cbd8f83f464f5116fcba8267421ebfa 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 6234c23572fd3b4bd0dbd0991d7e6904c54809ff..86eead008cc45e3603021de79dfa48bb865a332a 100644
index 5cc1a1550807399c2d7329f521dd2a97e0a42d4b..6361b13871bae7ae46a12f6e21e9a055f842fb51 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 {
@@ -1122,7 +1122,7 @@ index 6234c23572fd3b4bd0dbd0991d7e6904c54809ff..86eead008cc45e3603021de79dfa48bb
}
}
// Paper start - detailed watchdog information
@@ -3117,7 +3117,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3100,7 +3100,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 6234c23572fd3b4bd0dbd0991d7e6904c54809ff..86eead008cc45e3603021de79dfa48bb
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);
@@ -3135,7 +3135,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3118,7 +3118,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
} // Paper
// CraftBukkit end
@@ -1140,7 +1140,7 @@ index 6234c23572fd3b4bd0dbd0991d7e6904c54809ff..86eead008cc45e3603021de79dfa48bb
}
this.isInsidePortal = false;
@@ -3606,14 +3606,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3589,14 +3589,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
// Paper end
if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -1157,7 +1157,7 @@ index 6234c23572fd3b4bd0dbd0991d7e6904c54809ff..86eead008cc45e3603021de79dfa48bb
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) {
@@ -3647,7 +3647,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3630,7 +3630,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.unRide();
// CraftBukkit end
@@ -1166,7 +1166,7 @@ index 6234c23572fd3b4bd0dbd0991d7e6904c54809ff..86eead008cc45e3603021de79dfa48bb
// Paper start - Change lead drop timing to prevent dupe
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3670,10 +3670,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3653,10 +3653,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.removeAfterChangingDimensions();
@@ -1180,10 +1180,10 @@ index 6234c23572fd3b4bd0dbd0991d7e6904c54809ff..86eead008cc45e3603021de79dfa48bb
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 428c99b98b8161eac82c651a477ba478b4ee0ce7..f8b920d7b7afff39a62c8a8a08512a7c59a23687 100644
index ec3a9946b7387754c8f5a15ce6268a7fa666db02..9012b5b918bca409166db9eb29c201a793886dbb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -411,7 +411,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -410,7 +410,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
super.baseTick();
@@ -1192,7 +1192,7 @@ index 428c99b98b8161eac82c651a477ba478b4ee0ce7..f8b920d7b7afff39a62c8a8a08512a7c
if (this.fireImmune() || this.level().isClientSide) {
this.clearFire();
}
@@ -514,7 +514,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -513,7 +513,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO = this.yHeadRot;
this.yRotO = this.getYRot();
this.xRotO = this.getXRot();
@@ -1201,7 +1201,7 @@ index 428c99b98b8161eac82c651a477ba478b4ee0ce7..f8b920d7b7afff39a62c8a8a08512a7c
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3133,10 +3133,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3123,10 +3123,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1215,7 +1215,7 @@ index 428c99b98b8161eac82c651a477ba478b4ee0ce7..f8b920d7b7afff39a62c8a8a08512a7c
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3148,7 +3148,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3138,7 +3138,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1224,7 +1224,7 @@ index 428c99b98b8161eac82c651a477ba478b4ee0ce7..f8b920d7b7afff39a62c8a8a08512a7c
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3437,19 +3437,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3427,19 +3427,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d4, d5, d6);
@@ -1249,7 +1249,7 @@ index 428c99b98b8161eac82c651a477ba478b4ee0ce7..f8b920d7b7afff39a62c8a8a08512a7c
if (this.jumping && this.isAffectedByFluids()) {
double d7;
@@ -3476,8 +3476,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3466,8 +3466,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1260,7 +1260,7 @@ index 428c99b98b8161eac82c651a477ba478b4ee0ce7..f8b920d7b7afff39a62c8a8a08512a7c
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3504,8 +3504,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3494,8 +3494,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1271,7 +1271,7 @@ index 428c99b98b8161eac82c651a477ba478b4ee0ce7..f8b920d7b7afff39a62c8a8a08512a7c
if (!this.level().isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3522,15 +3522,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3512,15 +3512,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}
@@ -1593,10 +1593,10 @@ index af8438ae8c805d3276ef2d82eb39b08880fcc8a1..6b012bea26e8ef0c04571f43da67f6e1
}
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 df08f220b7c25fd9e7daa6a23816cb8d6ff4c003..1a989f9fbeaf51b9dc3ba32e1f6fb838db5af13e 100644
index 0f8af63a88e425e5e66f68133b6c604caefc6977..31cfc2c8c5188a266c9e9993e5cf322e000df397 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
@@ -223,13 +223,14 @@ public class Goat extends Animal {
@@ -224,13 +224,14 @@ public class Goat extends Animal {
private int behaviorTick = 0; // Pufferfish
@Override
protected void customServerAiStep() {