Pull Paper itemframe patch

KaiijuMC · Jul 2, 2023 · 1f0e0e1 · 1f0e0e1
1 parent 449d1e5
commit 1f0e0e1
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 6 deletions.
diff --git a/...018-Fix-off-thread-spider-addEffect.patch → ...018-Fix-off-thread-spider-addEffect.patch b/...018-Fix-off-thread-spider-addEffect.patch → ...018-Fix-off-thread-spider-addEffect.patch
diff --git a/patches/server/0019-Add-SIMD-utilities.patch → patches/server/0018-Add-SIMD-utilities.patch b/patches/server/0019-Add-SIMD-utilities.patch → patches/server/0018-Add-SIMD-utilities.patch
diff --git a/...20-Toggle-shared-random-for-players.patch → ...19-Toggle-shared-random-for-players.patch b/...20-Toggle-shared-random-for-players.patch → ...19-Toggle-shared-random-for-players.patch
@@ -20,7 +20,7 @@ index e1f50adfa216320bc53b460d11666064cb58c969..c934341c17caf4696065ac6c39bdfef5
      }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index deaf4b65b6c9f3dbab6578c25fb78ca84507f70b..cdf669fc1065632033fab4154f0113474b984152 100644
+index 27b57db24587337ccdce29e492052ca419863323..fc6279a39fd5e1bd02b2d9e77f451cd9ba1baf78 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -566,6 +566,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

diff --git a/...021-Kick-player-instead-of-crashing.patch → ...020-Kick-player-instead-of-crashing.patch b/...021-Kick-player-instead-of-crashing.patch → ...020-Kick-player-instead-of-crashing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Kick player instead of crashing
 
 
 diff --git a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
-index 7b664f32868028758d0c6ee1eaa82efcd83661d2..8b325c764df7003f8e6984a85267cd78fc7672ed 100644
+index c5df121d6194a97b20dc390698991b9c72dba538..9990fccc741a139c57528f70157ae63dbe3fd8e8 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
 @@ -485,7 +485,12 @@ public class RegionizedPlayerChunkLoader {

diff --git a/...le-fix-TripWire-state-inconsistency.patch → ...le-fix-TripWire-state-inconsistency.patch b/...le-fix-TripWire-state-inconsistency.patch → ...le-fix-TripWire-state-inconsistency.patch
diff --git a/...g-throttling-removal-to-prevent-lag.patch → ...g-throttling-removal-to-prevent-lag.patch b/...g-throttling-removal-to-prevent-lag.patch → ...g-throttling-removal-to-prevent-lag.patch
@@ -319,7 +319,7 @@ index 991e4c19763a34a6fead88363e007c2d11aad836..24a2d3f496727790f63cb66a2534d442
          dev.kaiijumc.kaiiju.KaiijuConfig.registerCommands();
          // Kaiiju end
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 66509fa23bfcde70abd3917eb774cf48d5d6da93..8fd9e3cee5a671ef8425311371cde57449ef1d8e 100644
+index 245c3e63588379f51780963ba91bc6bf0a3feda6..761019f86983daaea4fface519e052f8fb6de1cd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -822,6 +822,7 @@ public class ServerLevel extends Level implements WorldGenLevel {

diff --git a/...rver/0024-Toggle-safe-teleportation.patch → ...rver/0023-Toggle-safe-teleportation.patch b/...rver/0024-Toggle-safe-teleportation.patch → ...rver/0023-Toggle-safe-teleportation.patch
diff --git a/...server/0025-Toggle-sand-duplication.patch → ...server/0024-Toggle-sand-duplication.patch b/...server/0025-Toggle-sand-duplication.patch → ...server/0024-Toggle-sand-duplication.patch
diff --git a/...26-Vanilla-end-portal-teleportation.patch → ...25-Vanilla-end-portal-teleportation.patch b/...26-Vanilla-end-portal-teleportation.patch → ...25-Vanilla-end-portal-teleportation.patch
diff --git a/...-Swap-distanceToSqr-and-target-test.patch → ...-Swap-distanceToSqr-and-target-test.patch b/...-Swap-distanceToSqr-and-target-test.patch → ...-Swap-distanceToSqr-and-target-test.patch
diff --git a/...Use-Math.floor-instead-of-fastfloor.patch → ...Use-Math.floor-instead-of-fastfloor.patch b/...Use-Math.floor-instead-of-fastfloor.patch → ...Use-Math.floor-instead-of-fastfloor.patch
diff --git a/...-enable-moving-into-unloaded-chunks.patch → ...-enable-moving-into-unloaded-chunks.patch b/...-enable-moving-into-unloaded-chunks.patch → ...-enable-moving-into-unloaded-chunks.patch
diff --git a/.../0030-Don-t-pathfind-outside-region.patch → .../0029-Don-t-pathfind-outside-region.patch b/.../0030-Don-t-pathfind-outside-region.patch → .../0029-Don-t-pathfind-outside-region.patch
diff --git a/...Don-t-spam-recipe-changes-on-update.patch → ...Don-t-spam-recipe-changes-on-update.patch b/...Don-t-spam-recipe-changes-on-update.patch → ...Don-t-spam-recipe-changes-on-update.patch
diff --git a/...r/0032-Option-to-disable-vanish-api.patch → ...r/0031-Option-to-disable-vanish-api.patch b/...r/0032-Option-to-disable-vanish-api.patch → ...r/0031-Option-to-disable-vanish-api.patch
diff --git a/...0033-Option-to-disable-player-stats.patch → ...0032-Option-to-disable-player-stats.patch b/...0033-Option-to-disable-player-stats.patch → ...0032-Option-to-disable-player-stats.patch
@@ -21,7 +21,7 @@ index f49510c999ce5241f26dc9ba90a6148bf31467c7..b23f2df433d7ebc871f4009081c28ed9
 
      public static String serverModName = "Kaiiju";
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d58e8211fc765c61548ac2a180de87dd2934ba37..19642e7bf00dc9fdc157e70b4d6849a9898a2557 100644
+index 817f79bfca1aec161cb4635b9c7a8e21b14db7eb..bba90683202b47284208416a37724e9d54266ffa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2081,6 +2081,7 @@ public class ServerPlayer extends Player {

diff --git a/...0034-Option-to-disable-achievements.patch → ...0033-Option-to-disable-achievements.patch b/...0034-Option-to-disable-achievements.patch → ...0033-Option-to-disable-achievements.patch
@@ -24,7 +24,7 @@ index 9f0095f2196133a8bcffd5306aa9ac0b99b2f8d7..31d66bb2fcf4bb7262df2d8006e307fe
 
      public boolean fixVoidTrading = true;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 19642e7bf00dc9fdc157e70b4d6849a9898a2557..5e81fd3b1f88f33314f7b24b3e9ba2be21addd0c 100644
+index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67ebac5561 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -734,7 +734,7 @@ public class ServerPlayer extends Player {

diff --git a/...5-Option-to-disable-arm-swing-event.patch → ...4-Option-to-disable-arm-swing-event.patch b/...5-Option-to-disable-arm-swing-event.patch → ...4-Option-to-disable-arm-swing-event.patch
@@ -22,7 +22,7 @@ index b23f2df433d7ebc871f4009081c28ed9054d91c7..ec71f3f52cb8f7931aabd94619d2e7a2
 
      public static String serverModName = "Kaiiju";
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b2ed157a17cada4887e543a23ee65642eb54637e..a238a3f62a92748d1dfb11fcf8938d33409b7a0c 100644
+index 399dd9e47838af7063680f68870611db7a0f8fb3..48555018e76b8983b8c7b66e404ac02c8f3bc1f7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2647,6 +2647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

diff --git a/...n-to-disable-creatures-spawn-events.patch → ...n-to-disable-creatures-spawn-events.patch b/...n-to-disable-creatures-spawn-events.patch → ...n-to-disable-creatures-spawn-events.patch
diff --git a/...to-disable-dolphin-swim-to-treasure.patch → ...to-disable-dolphin-swim-to-treasure.patch b/...to-disable-dolphin-swim-to-treasure.patch → ...to-disable-dolphin-swim-to-treasure.patch
diff --git a/...o-disable-ensure-tick-thread-checks.patch → ...o-disable-ensure-tick-thread-checks.patch b/...o-disable-ensure-tick-thread-checks.patch → ...o-disable-ensure-tick-thread-checks.patch
diff --git a/patches/server/0038-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0038-Only-tick-item-frames-if-players-can-see-it.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Redned <redned235@gmail.com>
+Date: Sun, 2 Jul 2023 18:56:57 +0300
+Subject: [PATCH] Only tick item frames if players can see it
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
+index 5558d87ef182f82be7877455dd027082c6a80632..ce93e83e7e8d3ff848318c6ecdba65f6dd5249e1 100644
+--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
++++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
+@@ -108,7 +108,7 @@ public class ServerEntity {
+
+         Entity entity = this.entity;
+
+-        if (entity instanceof ItemFrame) {
++        if (!this.trackedPlayers.isEmpty() && entity instanceof ItemFrame) { // Paper - Only tick item frames if players can see it
+             ItemFrame entityitemframe = (ItemFrame) entity;
+
+             if (true || this.tickCount % 10 == 0) { // CraftBukkit - Moved below, should always enter this block