Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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@55a16d8 Fix Varint21FrameDecoder cached length buf usage
PaperMC/Paper@e6e37ba Add api to resolve components (#7648)
PaperMC/Paper@7168438 [ci skip] Rework workflows to support optional paperclip build (#8583)
PaperMC/Paper@da230d5 More vanilla friendly methods to update trades (#8478)
PaperMC/Paper@8aff07a Add /paper dumplisteners command (#8507)
PaperMC/Paper@b8919a7 pr command action fixes (#8591)
PaperMC/Paper@185fa48 Fix chest relooting mechanics (#8580)
PaperMC/Paper@b4beac0 Fixes potential issues arising from optimizing getPlayerByUUID (#8585)
PaperMC/Paper@f637b1a Fix async entity add due to fungus trees (#7626)
PaperMC/Paper@414ea80 ItemStack damage API (#7801)
PaperMC/Paper@d98c370 Add displayName methods for advancements (#8584)
PaperMC/Paper@44bb599 Add Tick TemporalUnit (#5445)
PaperMC/Paper@9f7eef8 Friction API (#6611)
PaperMC/Paper@4048d3e Allow using degrees for ArmorStand rotations (#7847)
PaperMC/Paper@f59c802 Schoolable Fish API (#7089)
PaperMC/Paper@21b964a Added ability to control player's insomnia and phantoms spawning (#6500)
PaperMC/Paper@f1583fc Add `/paper dumplisteners tofile` and increase detail of command output (#8592)
This commit is contained in:
BillyGalbreath
2022-11-26 18:48:36 -06:00
parent a8b26671d1
commit 47dc2e92f5
90 changed files with 546 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server/0287-Remove-Timings.patch
View File

@@ -477,10 +477,10 @@ index 014255019ce3f22e0c8cf8f0a775669f909d18f4..6a11e522c5bd9042dcf89e2538d35444
// Paper end - use set of chunks requiring updates, rather than iterating every single one loaded
// Paper start - controlled flush for entity tracker packets
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a764ccfa948 100644
index 029d8782ad1371dc95ba244d56b20a4801b004b7..7af1b6036fa05533c2e9801988dcf07b51c18f6f 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -686,7 +686,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -687,7 +687,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.updateSkyBrightness();
this.tickTime();
gameprofilerfiller.popPush("tickPending");
@@ -489,7 +489,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
if (!this.isDebug()) {
j = this.getGameTime();
gameprofilerfiller.push("blockTicks");
@@ -695,20 +695,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -696,20 +696,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.fluidTicks.tick(j, 65536, this::tickFluid);
gameprofilerfiller.pop();
}
@@ -517,7 +517,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
this.handlingTick = false;
gameprofilerfiller.pop();
boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
@@ -719,7 +719,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -720,7 +720,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (flag || this.emptyTime++ < 300) {
gameprofilerfiller.push("entities");
@@ -526,7 +526,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
if (this.dragonFight != null) {
gameprofilerfiller.push("dragonFight");
this.dragonFight.tick();
@@ -727,7 +727,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -728,7 +728,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -535,7 +535,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
this.entityTickList.forEach((entity) -> {
entity.activatedPriorityReset = false; // Pufferfish - DAB
if (!entity.isRemoved()) {
@@ -768,8 +768,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -769,8 +769,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
});
@@ -546,7 +546,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
gameprofilerfiller.pop();
this.tickBlockEntities();
}
@@ -931,7 +931,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -932,7 +932,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper start - optimise random block ticking
gameprofilerfiller.popPush("randomTick");
@@ -555,7 +555,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
if (randomTickSpeed > 0) {
LevelChunkSection[] sections = chunk.getSections();
int minSection = io.papermc.paper.util.WorldUtil.getMinSection(this);
@@ -965,7 +965,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -966,7 +966,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
// Paper end - optimise random block ticking
@@ -564,7 +564,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
gameprofilerfiller.pop();
}
@@ -1258,8 +1258,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1259,8 +1259,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot end
// Paper start- timings
final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(entity);
@@ -575,7 +575,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
// Paper end - timings
entity.setOldPosAndRot();
ProfilerFiller gameprofilerfiller = this.getProfiler();
@@ -1275,7 +1275,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1276,7 +1276,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.postTick(); // CraftBukkit
} else { entity.inactiveTick(); } // Paper - EAR 2
this.getProfiler().pop();
@@ -584,7 +584,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
Iterator iterator = entity.getPassengers().iterator();
while (iterator.hasNext()) {
@@ -1298,8 +1298,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1299,8 +1299,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (passenger instanceof Player || this.entityTickList.contains(passenger)) {
// Paper - EAR 2
final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
@@ -595,7 +595,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -1329,7 +1329,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1330,7 +1330,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.tickPassenger(passenger, entity2);
}
@@ -604,7 +604,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
}
} else {
passenger.stopRiding();
@@ -1349,14 +1349,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1350,14 +1350,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld()));
}
@@ -622,7 +622,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
// Copied from save()
// CraftBukkit start - moved from MinecraftServer.saveChunks
@@ -1368,7 +1368,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1369,7 +1369,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.convertable.saveDataTag(this.server.registryHolder, this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
}
// CraftBukkit end
@@ -631,7 +631,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
}
// Paper end
@@ -1382,7 +1382,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1383,7 +1383,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (!savingDisabled) {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
@@ -640,7 +640,7 @@ index 4ba091c3ecb1cf65839b91a459954545214ef15b..c94246d19a0d2f2a87f74d6ca4b14a76
if (progressListener != null) {
progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
}
@@ -1392,11 +1392,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1393,11 +1393,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
progressListener.progressStage(Component.translatable("menu.savingChunks"));
}