(JettPack) 10 patches left

patches/server/0006-Fix-Purpur-patches.patch

@@ -27,7 +27,7 @@ index 9bb8f278149cb1809767935375ca155e6c7916b5..d2dbbf8f2b5e3a2dc6a916dd9927318d
          return executedUnloadTask | canSaveChunk | canSaveEntities | canSavePOI;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index abeb41655dd7f368a9f16e2ebec571633222a910..c35e25e1df8d679104b394e308bdbcc1723296ad 100644
+index abeb41655dd7f368a9f16e2ebec571633222a910..68fac0f4687f713ec0c5dfb1d639540b63f4ea38 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -942,7 +942,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -39,10 +39,27 @@ index abeb41655dd7f368a9f16e2ebec571633222a910..c35e25e1df8d679104b394e308bdbcc1
          // Purpur start
          if (upnp) {
              if (dev.omega24.upnp4j.UPnP4J.close(this.getPort(), dev.omega24.upnp4j.util.Protocol.TCP)) {
+@@ -951,6 +951,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 LOGGER.error("[UPnP] Failed to close port {}", this.getPort());
+             }
+         }
++        // Purpur end // Prismarine - Mark
+         // CraftBukkit start
+         if (this.server != null) {
+             this.server.disablePlugins();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 09d9433521ee776943e79492fbf7b699b53ccbe3..6b9b6043a03ed8a9ce4af40fb903830fcb437e60 100644
+index 09d9433521ee776943e79492fbf7b699b53ccbe3..6ca99115caf633ea55991ab5ad26ae215ed9c131 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -658,7 +658,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
+         long j;
+
+-        if (this.purpurConfig.playersSkipNight && this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
++        if (this.purpurConfig.playersSkipNight && this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) { // Purpur // Prismarine - Mark
+             // CraftBukkit start
+             j = this.levelData.getDayTime() + 24000L;
+             TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime());
 @@ -968,7 +968,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return holder.is(PoiTypes.LIGHTNING_ROD);
          }, (blockposition1) -> {
@@ -61,3 +78,12 @@ index 09d9433521ee776943e79492fbf7b699b53ccbe3..6b9b6043a03ed8a9ce4af40fb903830f
 
                  if (this.sleepStatus.areEnoughSleeping(i)) {
                      // Purpur start
+@@ -1242,7 +1242,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+             // Paper end - log detailed entity tick information
+         ++TimingHistory.entityTicks; // Paper - timings
+         // Spigot start
+-        co.aikar.timings.Timing timer; // Paper
++        //co.aikar.timings.Timing timer; // Paper // Prismarine
+         /*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below
+             entity.tickCount++;
+             timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings

patches/server/0012-Slice-Server-Patches.patch

@@ -212,10 +212,10 @@ index 80a2b43bf50ab4cb6a908d55d690a6c0a4ab8d3d..7e7e7f4d9437f450e1f40828603cae5b
      }
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cd414a9275e6d9f8c704854763b18f4ee43b67b7..0e6895350f8d9ff2a417fa9ca12dc37dd7fae28f 100644
+index 61bbb8a3738f289bd61c438a27a496f904c26b78..0805c3be61395d31f78524240a7330f6e9b24af3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3150,7 +3150,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3151,7 +3151,7 @@ public abstract class LivingEntity extends Entity {
 
              ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
 

patches/server/0013-Do-not-send-useless-entity-packets.patch

@@ -63,14 +63,14 @@ index 22acc4d451a96c4b7655a9f2333a283d2b891caa..e69cfe03e35b2e8eae0f82084a5d7cc1
      public void removePairing(ServerPlayer player) {
          this.entity.stopSeenByPlayer(player);
 diff --git a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-index f059997d1d2b9b5fb9cba6e8ef8bcfef0cf24d9a..b7e07417c65d927dcc97668aee03d58eed530d84 100644
+index 7ff0d6ca8fcd4c9c5692647fe602512cb31ad65b..c1630079740f4ff37d772fa31859efa26af1c61e 100644
 --- a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
 +++ b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-@@ -177,4 +177,9 @@ public class PrismarineConfig {
-     private static void logPlayerLoginLocation() {
-         logPlayerLoginLocation = getBoolean("settings.log-player-login-location", logPlayerLoginLocation);
+@@ -195,4 +195,9 @@ public class PrismarineConfig {
+     private static void fastHandSwing() {
+         fastHandSwing = getBoolean("settings.fast-hand-swing", fastHandSwing);
      }
-+    
++
 +    public static boolean doNotSendUselessEntityPackets = true;
 +    private static void doNotSendUselessEntityPackets() {
 +        doNotSendUselessEntityPackets = getBoolean("settings.do-not-send-useless-entity-packets", doNotSendUselessEntityPackets);

patches/server/0014-Use-normal-context-which-is-already-lazy.patch

@@ -38,10 +38,10 @@ index a87f6380b2c387fb0cdd40d5087b5c93492e3c88..70009f417eb39a6c10b895b372309117
                                      VoxelShape voxelshape2 = blockData.getCollisionShape(getter, mutablePos, collisionShape);
                                      if (voxelshape2 != Shapes.empty()) {
 diff --git a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-index b7e07417c65d927dcc97668aee03d58eed530d84..733ee49a31381cb4e82aa4d5d69e10af2d3e11da 100644
+index c1630079740f4ff37d772fa31859efa26af1c61e..30077cc34ba45025ec5ec60c01b84ed4b3d2dcc6 100644
 --- a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
 +++ b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-@@ -182,4 +182,9 @@ public class PrismarineConfig {
+@@ -200,4 +200,9 @@ public class PrismarineConfig {
      private static void doNotSendUselessEntityPackets() {
          doNotSendUselessEntityPackets = getBoolean("settings.do-not-send-useless-entity-packets", doNotSendUselessEntityPackets);
      }

patches/server/0018-Paper-PRs.patch

@@ -213,10 +213,10 @@ index deffa277272c34adb39d7c3e69e91502780a090e..66c65df229acc4041ed2027df07d4ab0
          if (spawnDelay > 0 && --tickDelay > 0) return;
          tickDelay = world.paperConfig().tickRates.mobSpawner;
 diff --git a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-index 733ee49a31381cb4e82aa4d5d69e10af2d3e11da..28f05e224afffd7255f1e7e4bccbd372d7f9b1ac 100644
+index 30077cc34ba45025ec5ec60c01b84ed4b3d2dcc6..9bfbe138c4dc704a018ec7c16d04450b57579eea 100644
 --- a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
 +++ b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-@@ -187,4 +187,13 @@ public class PrismarineConfig {
+@@ -205,4 +205,13 @@ public class PrismarineConfig {
      private static void useAirplaneCollisionContext() {
          useNormalCollisionContext = getBoolean("settings.use-normal-collision-context", useNormalCollisionContext);
      }

patches/server/0019-Experimental-Akarin-tweaks.patch

@@ -111,10 +111,10 @@ index 4fd709a550bf8da1e996894a1ca6b91206c31e9e..bd328d4d09f6fb885e343a039f5817f0
      }
 
 diff --git a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-index 28f05e224afffd7255f1e7e4bccbd372d7f9b1ac..5e2a7471c69a5bb7ceabf5aeee332f6208b9d309 100644
+index 9bfbe138c4dc704a018ec7c16d04450b57579eea..15d831471095782112e1087893d1bf12626e5080 100644
 --- a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
 +++ b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-@@ -196,4 +196,9 @@ public class PrismarineConfig {
+@@ -214,4 +214,9 @@ public class PrismarineConfig {
              set("settings.pull-requests.paper.prevent-healing-by-negative-amounts", null);
          }
      }

patches/server/0024-Implement-No-Chat-Reports.patch

@@ -89,10 +89,10 @@ index f669386d8b17f78006917869a8393173b676c448..df8562aef9015194269aaaa451f6efa6
 
      public Inventory getInventory() {
 diff --git a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-index 5e2a7471c69a5bb7ceabf5aeee332f6208b9d309..536125b4fad19667464adba054c9a7bcb35410c2 100644
+index 15d831471095782112e1087893d1bf12626e5080..38caff0e3f387ec6ff090ca1501718c9a1173c3c 100644
 --- a/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
 +++ b/src/main/java/net/prismarineteam/prismarine/PrismarineConfig.java
-@@ -201,4 +201,11 @@ public class PrismarineConfig {
+@@ -219,4 +219,11 @@ public class PrismarineConfig {
      private static void storePlayerJsonListAsynchronously() {
          storePlayerJsonListAsynchronously = getBoolean("settings.store-player-json-list-asynchronously", storePlayerJsonListAsynchronously);
      }