Updated Upstream(Folia)

LuminolMC · Aug 25, 2024 · 973b437 · 973b437
1 parent 051ed97
commit 973b437
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/patches/api/0004-FoliaPR-Add-TPS-From-Region.patch b/patches/api/0004-FoliaPR-Add-TPS-From-Region.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] FoliaPR Add TPS From Region
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 886920b33b37bdefc301f898ad0003e40eff6443..122433e2f0d3c8dfedb30814c8b24e75d4fe879f 100644
+index 63eb35aebc4551355ea1ea5cd1305d93502f0dbc..de5922397c7d424715e812819b14030639211846 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2394,6 +2394,28 @@ public final class Bukkit {
+@@ -2405,6 +2405,28 @@ public final class Bukkit {
      }
      // Paper end
 
@@ -38,10 +38,10 @@ index 886920b33b37bdefc301f898ad0003e40eff6443..122433e2f0d3c8dfedb30814c8b24e75
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d6f72cb1e2380bd1a18d695c7d26ae3834f6eb52..280ce7ca1bfdd4b7924a48675192e24489b82b9e 100644
+index 8a7ba7d14f20b8169854daaf26e8f4da4563f166..11025aaab88f109f03cd6cda897fc80488cee060 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2047,6 +2047,24 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2058,6 +2058,24 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      double getAverageTickTime();
      // Paper end
 

diff --git a/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch
@@ -50,7 +50,7 @@ index 7da908cfc85e2406e995d860a240aaf3f999b6e6..23541e9c5734334a1cd6e7730288d6dd
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
          this.chatVisibility = ChatVisiblity.FULL;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3bc578038655a8ac36618e8ad6083765ee482079..4881348897be17e86c288eadda751c2fd94d02c8 100644
+index 8a6e2ec591815eb41c4fd04c51acb3681972e928..7a3085e0328cf37f22cba331f97b295db44224b9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -695,7 +695,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -63,7 +63,7 @@ index 3bc578038655a8ac36618e8ad6083765ee482079..4881348897be17e86c288eadda751c2f
 
                      // If the event is cancelled we move the player back to their old location.
                      if (event.isCancelled()) {
-@@ -1602,7 +1604,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1606,7 +1608,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
                                      Location oldTo = to.clone();
                                      PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);

diff --git a/patches/server/0027-Petal-Reduce-sensor-work.patch b/patches/server/0027-Petal-Reduce-sensor-work.patch
@@ -33,10 +33,10 @@ index 0000000000000000000000000000000000000000..dd45cf1fde5ee4cf8347064f106c64b8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 741ba5f0834ab5f0b0ffdeb91a9ff8cfaf922792..85ba544b5cb106847034c5e7a6827045c4f35040 100644
+index a4ddf384bc1f58ceac5f49721aca652276ad62eb..ca86705ec7cec72c911fde296149a4e5aec56329 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -936,12 +936,12 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -943,12 +943,12 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              return;
          }
          // Paper end - Allow nerfed mobs to jump and float

diff --git a/patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch
@@ -108,7 +108,7 @@ index 293ec464b1cb4db1734d0c059e59f60bfeb2b7eb..5d3e5262d9b7565ddf045ce9f97ec190
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 85ba544b5cb106847034c5e7a6827045c4f35040..96a95939df41721433cefbfc07a5d75ea6b961e9 100644
+index ca86705ec7cec72c911fde296149a4e5aec56329..03eed9e17816ba60c1ff5cd1560b3794215802e4 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -244,10 +244,10 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -124,7 +124,7 @@ index 85ba544b5cb106847034c5e7a6827045c4f35040..96a95939df41721433cefbfc07a5d75e
              this.targetSelector.tick();
          }
      }
-@@ -945,16 +945,20 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -952,16 +952,20 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
 
          if (i % 2 != 0 && this.tickCount > 1) {
              gameprofilerfiller.push("targetSelector");

diff --git a/patches/server/0043-Gale-Optimize-sun-burn-tick.patch b/patches/server/0043-Gale-Optimize-sun-burn-tick.patch
@@ -39,10 +39,10 @@ index e8984feea7fb06600329bae05b15d317f8ae78a0..071de4ddcff846f469d510b4147c3ed3
          this.absMoveTo(x, y, z);
          this.absRotateTo(yaw, pitch);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2384a9e68f99b61382d9d8a46523d226786ee584..73c65124d6996b4a74a044e562f04eda573589fc 100644
+index 5f43c6bb541e811e51f00fb205624c157cef0483..c4d499536f443200c059c83b142f644e4724db1c 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1774,13 +1774,29 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1781,13 +1781,29 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
 
      protected void playAttackSound() {}
 

diff --git a/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
@@ -359,10 +359,10 @@ index 4f701788bd21b61cad251a3a88f9bc416fb99051..86caa40a91ee0385bc32fd19d0fec6bd
 +    // KioCG end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 73c65124d6996b4a74a044e562f04eda573589fc..b87a1b054998a062e1f69b56daff520e3e4e0b6a 100644
+index c4d499536f443200c059c83b142f644e4724db1c..e6484f7e04a5b5ad831c3f720a196a83b2ab1008 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1850,4 +1850,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1857,4 +1857,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
 
          return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
      }