Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ec3cfa9 Only create paper.yml-README.txt on config conversion (#8334)
PaperMC/Paper@928bcc8 Updated Upstream (Bukkit/CraftBukkit) (#8430)
PaperMC/Paper@616db71 Fix nothing mlg (#8432)
PaperMC/Paper@011caa4 [ci skip] Minor patch cleanup
PaperMC/Paper@15e1748 Avoid resizing of ArrayList in ChunkMap#getPlayers (#8416)
PaperMC/Paper@ad3d357 Remove unnecessary onTrackingStart during nav warning
PaperMC/Paper@9d63b07 Fix custom piglin interest items (#8097)
PaperMC/Paper@ff67f1f EntityPickupItemEvent fixes (#8096)

Pufferfish Changes:
pufferfish-gg/Pufferfish@08aeb1a Updated Upstream (Paper)
pufferfish-gg/Pufferfish@58865aa Updated Upstream (Paper)
pufferfish-gg/Pufferfish@d960687 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@9d9a0e1 Update snakeyaml dependency
This commit is contained in:
BillyGalbreath
2022-10-05 04:26:13 -05:00
parent b54122adf4
commit f5ae75874a
31 changed files with 140 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,7 +371,7 @@ index 30093cd8bd35f0bbc8f26eca370622ee12a046b6..2986f110348b376bcdc64fa39b688855
++j;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index a57567679e01ae9a636d51fe53cda4abbca69f13..9c48b7fb10ba88e18d473d674fc1f50fb65cc633 100644
index f702b5777938324e9f10015d8e145225689a37d0..3203b953709ca7cb9172f5912a922131ad7ec9eb 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -606,20 +606,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -538,7 +538,7 @@ index 157efbbc57f1b5d92f296a70823c75b6d01ac065..cd5533c3c53215c9cc4be0b9097d76ef
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index d3b93712cd999d61f66a8ffefd9122ffc1596ba1..9f8d89e45c9d15f07e9b5c27451816ae06819f68 100644
index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199a3ad3197 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -651,12 +651,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -787,7 +787,7 @@ index 4abac5e3ba5dcf27248bda31d95c85bb5e23c19d..6979305279996be59756d0424e5bc16a
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 7a0adbdcadd20269e92cb698b569f04b169dade4..72cb935faed7c96d6759c020b48a9e66be99dbfd 100644
index 0064f459e7326d3bc6778fdb7de0a0f8bc080bae..faa7fecfdffa787ebdcaa0279c9f3295605b5bed 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -416,7 +416,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1139,7 +1139,7 @@ index 4f5c3c4285dd3b7ac901fb55e1ebbfec37ca601f..efd84a22bc063fe6266be876a38186c0
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e25cfa7467 100644
index 88f0d44c423ed246a25a4fd7cf3b2274def70c4a..9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -397,7 +397,7 @@ public abstract class LivingEntity extends Entity {
@@ -1160,7 +1160,7 @@ index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e2
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3087,10 +3087,10 @@ public abstract class LivingEntity extends Entity {
@@ -3090,10 +3090,10 @@ public abstract class LivingEntity extends Entity {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1174,7 +1174,7 @@ index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e2
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3102,7 +3102,7 @@ public abstract class LivingEntity extends Entity {
@@ -3105,7 +3105,7 @@ public abstract class LivingEntity extends Entity {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1183,7 +1183,7 @@ index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e2
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3384,19 +3384,19 @@ public abstract class LivingEntity extends Entity {
@@ -3387,19 +3387,19 @@ public abstract class LivingEntity extends Entity {
}
this.setDeltaMovement(d4, d5, d6);
@@ -1208,7 +1208,7 @@ index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e2
if (this.jumping && this.isAffectedByFluids()) {
double d7;
@@ -3423,8 +3423,8 @@ public abstract class LivingEntity extends Entity {
@@ -3426,8 +3426,8 @@ public abstract class LivingEntity extends Entity {
this.noJumpDelay = 0;
}
@@ -1219,7 +1219,7 @@ index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e2
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3433,8 +3433,8 @@ public abstract class LivingEntity extends Entity {
@@ -3436,8 +3436,8 @@ public abstract class LivingEntity extends Entity {
// SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza));
// SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -1230,7 +1230,7 @@ index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e2
boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
int i;
@@ -3454,15 +3454,15 @@ public abstract class LivingEntity extends Entity {
@@ -3457,15 +3457,15 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.FREEZE, (float) i);
}
@@ -1250,7 +1250,7 @@ index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e2
// 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 9ae5053c9c6591bdd8349e434ef505e64048b881..ec4f04327eb875989af4d7da0171e2000fadef6b 100644
index d0c52f9cd2001aa14c04684c24ef32f07e55c905..d5e3bd662da349fc2ee58c7800d79c60300f33b3 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -332,14 +332,14 @@ public abstract class Mob extends LivingEntity {
@@ -1531,7 +1531,7 @@ index 8561d1994cb8c42e69ef77fad16d037c205dad33..5268a56a7967275df63f5a5ddb592199
}
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 4688e567dff250437335cbde34db4483f535b79a..3b85ec87ec708d670710734a1c1b04b2313cbbea 100644
index fcbee79d3d872fe6ccf81b7ff932b86b1f9c93b4..6df25a181567021ee60ea72847459e25b9ee5b99 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
@@ -203,13 +203,13 @@ public class Goat extends Animal {
@@ -1587,7 +1587,7 @@ index 9d65b412e30f528d378de9072b48632c56c3e5bb..9ff882352b3fb69d8a8ecaf190870976
if (this.isConverting()) {
++this.timeInOverworld;
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index 68cb1fb0b1d5b4d4b656f71a35a5ba69e37511e2..01f0cfb119f51fa3dcb50ee543d500f85455d405 100644
index be060e07938e6b0a6f480e0b7b047ed16302057e..11fa67a167493bf15d85b68a0ceac36c0626e1dc 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -324,10 +324,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -1746,7 +1746,7 @@ index 93711ef7df591ab0f50b8f0f7798f938eeb0f3b3..cf8693d02de53f1e02d55936f889c572
}
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 5c6fde4baf27e7d8f027c138d843da39a4a2ed36..4a8998a98987985e259b0a2a29ee7c94c1f3a4b1 100644
index c1541119630315521e75c1ba70ac99cd866afd71..b82541194979094f90b929cfdfb2b4c1fe0d2ad1 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -131,7 +131,7 @@ public final class NaturalSpawner {