Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-06-22 18:27:46 +02: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@193803df Migrate to leafpile
PaperMC/Paper@dbde0e01 fix compile errors without feature patches
PaperMC/Paper@daf505c4 update item meta
PaperMC/Paper@d335ed5b [ci/skip] add back entity tag reading for tropical fish bucket
PaperMC/Paper@85072339 migrate old tag more properly from entity_data
PaperMC/Paper@bb32c376 Reset destroy pos
PaperMC/Paper@43f4dcd5 Handle slime class rewrite in RegionAccessor#spawn
This commit is contained in:
granny
2026-06-21 14:19:11 -07:00
parent 335be8910e
commit 74ed91400f
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,7 +3,7 @@ group = org.purpurmc.purpur
mcVersion = 26.2 mcVersion = 26.2
apiVersion = 26.2 apiVersion = 26.2
channel=EXPERIMENTAL channel=EXPERIMENTAL
paperCommit = 13f9986cd09fd391f48d8c1a482f800850259017 paperCommit = 43f4dcd5e13d316630e4c45449ae2610067ee696
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

4
purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
View File

@@ -15,8 +15,8 @@
+ public boolean lagging = false; // Purpur - Lagging threshold + public boolean lagging = false; // Purpur - Lagging threshold
+ protected boolean upnp = false; // Purpur - UPnP Port Forwarding + protected boolean upnp = false; // Purpur - UPnP Port Forwarding
// Paper start - improve tick loop // Paper start - improve tick loop
public final ca.spottedleaf.moonrise.common.time.TickData tickTimes1s = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(1L)); public final ca.spottedleaf.common.time.TickData tickTimes1s = new ca.spottedleaf.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(1L));
public final ca.spottedleaf.moonrise.common.time.TickData tickTimes5s = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(5L)); public final ca.spottedleaf.common.time.TickData tickTimes5s = new ca.spottedleaf.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(5L));
@@ -418,6 +_,7 @@ @@ -418,6 +_,7 @@
public double[] computeTPS() { public double[] computeTPS() {
final long interval = this.tickRateManager().nanosecondsPerTick(); final long interval = this.tickRateManager().nanosecondsPerTick();

14
purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
View File

@@ -69,7 +69,7 @@
this.setServerLevel(newLevel); this.setServerLevel(newLevel);
this.connection.internalTeleport(PositionMoveRotation.of(transition), transition.relatives()); // CraftBukkit - use internal teleport without event this.connection.internalTeleport(PositionMoveRotation.of(transition), transition.relatives()); // CraftBukkit - use internal teleport without event
this.connection.resetPosition(); this.connection.resetPosition();
@@ -1670,7 +_,7 @@ @@ -1671,7 +_,7 @@
new AABB(bedCenter.x() - 8.0, bedCenter.y() - 5.0, bedCenter.z() - 8.0, bedCenter.x() + 8.0, bedCenter.y() + 5.0, bedCenter.z() + 8.0), new AABB(bedCenter.x() - 8.0, bedCenter.y() - 5.0, bedCenter.z() - 8.0, bedCenter.x() + 8.0, bedCenter.y() + 5.0, bedCenter.z() + 8.0),
monster -> monster.isPreventingPlayerRest(this.level(), this) monster -> monster.isPreventingPlayerRest(this.level(), this)
); );
@@ -78,7 +78,7 @@
return Either.left(Player.BedSleepingProblem.NOT_SAFE); return Either.left(Player.BedSleepingProblem.NOT_SAFE);
} }
} }
@@ -1706,7 +_,17 @@ @@ -1707,7 +_,17 @@
CriteriaTriggers.SLEPT_IN_BED.trigger(this); CriteriaTriggers.SLEPT_IN_BED.trigger(this);
}); });
if (!this.level().canSleepThroughNights()) { if (!this.level().canSleepThroughNights()) {
@@ -97,7 +97,7 @@
} }
this.level().updateSleepingPlayerList(); this.level().updateSleepingPlayerList();
@@ -1801,6 +_,7 @@ @@ -1802,6 +_,7 @@
@Override @Override
public void openTextEdit(final SignBlockEntity sign, final boolean isFrontText) { public void openTextEdit(final SignBlockEntity sign, final boolean isFrontText) {
@@ -105,7 +105,7 @@
this.connection.send(new ClientboundBlockUpdatePacket(this.level(), sign.getBlockPos())); this.connection.send(new ClientboundBlockUpdatePacket(this.level(), sign.getBlockPos()));
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos(), isFrontText)); this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos(), isFrontText));
} }
@@ -2145,6 +_,26 @@ @@ -2146,6 +_,26 @@
this.lastSentExp = -1; // CraftBukkit - Added to reset this.lastSentExp = -1; // CraftBukkit - Added to reset
} }
@@ -132,7 +132,7 @@
@Override @Override
public void completeUsingItem() { public void completeUsingItem() {
if (!this.useItem.isEmpty() && this.isUsingItem()) { if (!this.useItem.isEmpty() && this.isUsingItem()) {
@@ -2382,6 +_,20 @@ @@ -2383,6 +_,20 @@
); );
} }
@@ -153,7 +153,7 @@
@Override @Override
public void sendSystemMessage(final Component message) { public void sendSystemMessage(final Component message) {
this.sendSystemMessage(message, false); this.sendSystemMessage(message, false);
@@ -2533,7 +_,67 @@ @@ -2534,7 +_,67 @@
public void resetLastActionTime() { public void resetLastActionTime() {
this.lastActionTime = Util.getMillis(); this.lastActionTime = Util.getMillis();
@@ -222,7 +222,7 @@
public ServerStatsCounter getStats() { public ServerStatsCounter getStats() {
return this.stats; return this.stats;
@@ -3158,4 +_,65 @@ @@ -3159,4 +_,65 @@
return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity(); return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
} }
// CraftBukkit end // CraftBukkit end