diff --git a/gradle.properties b/gradle.properties index 8ac8f24d2..67f5cee37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ group = org.purpurmc.purpur mcVersion = 26.2 apiVersion = 26.2 channel=EXPERIMENTAL -paperCommit = 13f9986cd09fd391f48d8c1a482f800850259017 +paperCommit = 43f4dcd5e13d316630e4c45449ae2610067ee696 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch index 59998c4d9..259e43e08 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch @@ -15,8 +15,8 @@ + public boolean lagging = false; // Purpur - Lagging threshold + protected boolean upnp = false; // Purpur - UPnP Port Forwarding // 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.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 tickTimes1s = new ca.spottedleaf.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(1L)); + public final ca.spottedleaf.common.time.TickData tickTimes5s = new ca.spottedleaf.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(5L)); @@ -418,6 +_,7 @@ public double[] computeTPS() { final long interval = this.tickRateManager().nanosecondsPerTick(); diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch index 2a9ca238d..a5de2d6ac 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch @@ -69,7 +69,7 @@ this.setServerLevel(newLevel); this.connection.internalTeleport(PositionMoveRotation.of(transition), transition.relatives()); // CraftBukkit - use internal teleport without event 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), monster -> monster.isPreventingPlayerRest(this.level(), this) ); @@ -78,7 +78,7 @@ return Either.left(Player.BedSleepingProblem.NOT_SAFE); } } -@@ -1706,7 +_,17 @@ +@@ -1707,7 +_,17 @@ CriteriaTriggers.SLEPT_IN_BED.trigger(this); }); if (!this.level().canSleepThroughNights()) { @@ -97,7 +97,7 @@ } this.level().updateSleepingPlayerList(); -@@ -1801,6 +_,7 @@ +@@ -1802,6 +_,7 @@ @Override 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 ClientboundOpenSignEditorPacket(sign.getBlockPos(), isFrontText)); } -@@ -2145,6 +_,26 @@ +@@ -2146,6 +_,26 @@ this.lastSentExp = -1; // CraftBukkit - Added to reset } @@ -132,7 +132,7 @@ @Override public void completeUsingItem() { if (!this.useItem.isEmpty() && this.isUsingItem()) { -@@ -2382,6 +_,20 @@ +@@ -2383,6 +_,20 @@ ); } @@ -153,7 +153,7 @@ @Override public void sendSystemMessage(final Component message) { this.sendSystemMessage(message, false); -@@ -2533,7 +_,67 @@ +@@ -2534,7 +_,67 @@ public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); @@ -222,7 +222,7 @@ public ServerStatsCounter getStats() { return this.stats; -@@ -3158,4 +_,65 @@ +@@ -3159,4 +_,65 @@ return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end