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@c389b1c Fix configs that relied on outdated min/max y levels (#6986)
PaperMC/Paper@57555b8 Add missing structure set seed configs (#8030)
This commit is contained in:
BillyGalbreath
2022-10-09 23:55:46 -05:00
parent c577b117e7
commit 38313f701e
15 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@@ -1013,7 +1013,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406debaf04f 100644
index a4cfb3227db4d276f08d0b644cdc9dbe36fa3d05..2fea14c75d161d542c7694373763ddfa061ea699 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -822,7 +822,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1034,7 +1034,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
}
public void setSharedFlagOnFire(boolean onFire) {
@@ -1058,7 +1058,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1057,7 +1057,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
}
@@ -1043,7 +1043,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -1067,7 +1067,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1066,7 +1066,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);
@@ -1052,7 +1052,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
return;
}
// Paper end
@@ -1088,8 +1088,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1087,8 +1087,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
}
@@ -1063,7 +1063,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
boolean flag = !Mth.equal(movement.x, vec3d1.x);
boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
@@ -1108,7 +1108,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1107,7 +1107,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.checkFallDamage(vec3d1.y, this.onGround, iblockdata, blockposition);
if (this.isRemoved()) {
@@ -1072,7 +1072,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
} else {
if (this.horizontalCollision) {
Vec3 vec3d2 = this.getDeltaMovement();
@@ -1249,7 +1249,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1248,7 +1248,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.setRemainingFireTicks(-this.getFireImmuneTicks());
}
@@ -1081,7 +1081,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
}
}
// Paper start - detailed watchdog information
@@ -2918,7 +2918,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2917,7 +2917,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1090,7 +1090,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
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);
@@ -2936,7 +2936,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2935,7 +2935,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
} // Paper
// CraftBukkit end
@@ -1099,7 +1099,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
}
this.isInsidePortal = false;
@@ -3390,14 +3390,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3389,14 +3389,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
// Paper end
if (this.level instanceof ServerLevel && !this.isRemoved()) {
@@ -1116,7 +1116,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
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) {
@@ -3431,7 +3431,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3430,7 +3430,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.unRide();
// CraftBukkit end
@@ -1125,7 +1125,7 @@ index a8e5173ca3c49677767d40fba5a3690e286f902e..39d71c0b35095440d5b65876cf56f406
// Paper start - Change lead drop timing to prevent dupe
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3454,10 +3454,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3453,10 +3453,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.removeAfterChangingDimensions();