30/37

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     name: Release Plazma
     strategy:
       matrix:
-        base_jdk: [17]
+        base_jdk: [21]
         os: [ubuntu-22.04]
 
     if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')"

patches/unapplied/server/0021-Do-not-refresh-LootTable-for-non-player-interaction.patch → patches/server/0019-Do-not-refresh-LootTable-for-non-player-interaction.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Do not refresh LootTable for non player interaction
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index fa64bf5ad13c278438039b663ea3134e72108411..3ec9cb7c98cd5d3cb26e4a27174a75fe243c81c0 100644
+index 17da915ffa638500a83b67db0940a7b9a9b333a1..27a112818c000f4e649f044b7960ca988976876b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -68,6 +68,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
+@@ -74,6 +74,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
 
      @Override
      public void unpackLootTable(@org.jetbrains.annotations.Nullable final Player player) {

patches/unapplied/server/0022-Do-not-load-chunks-to-spawn-phantom.patch → patches/server/0020-Do-not-load-chunks-to-spawn-phantom.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Do not load chunks to spawn phantom
 
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index 0847aef56d8608cb1403485f231f30b2527f35ab..fee30f686a5d1ee50a00c2073efd5b0a80e85179 100644
+index 04f67f7b43d2f461c776c76614dc3e5f060aea63..b3fe0dd152b3e2e1b83b4ec2270d387e6117ec1c 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -71,6 +71,7 @@ public class PhantomSpawner implements CustomSpawner {
+@@ -70,6 +70,7 @@ public class PhantomSpawner implements CustomSpawner {
 
                                      if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
                                          BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));

patches/unapplied/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch → patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch

@@ -6,16 +6,16 @@ Subject: [PATCH] Add option to disable moved to quickly check for specific
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f7ac60e1aa188ec25a4c5d326cdd4a109a54101c..613f12a7194920690c42ffca2fdf6908700516e5 100644
+index 6d9242bc79526ebe4fdfe1f5d0ded429da2a9f95..4578339fc2ae7bff119a10744e2c2b3d4ac6cfd4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1472,6 +1472,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1444,6 +1444,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  }
                                  // Paper end - Prevent moving into unloaded chunks
 
 +                                if (!this.player.getBukkitEntity().hasPermission("plazma.bypass-moved-to-quickly-check") || !(org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.checkSpectatorMovedToQuickly && this.player.isSpectator())) // Plazma - Options to bypass moved to quickly check
-                                 if (!this.player.isChangingDimension() && (!this.player.level().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
-                                     float f2 = this.player.isFallFlying() ? 300.0F : 100.0F;
+                                 if (!this.player.isChangingDimension() && (!this.player.level().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !flag)) {
+                                     float f2 = flag ? 300.0F : 100.0F;
 
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 index a060257a62da7ed02b342b426e18e5f02ecdbdc9..f7e4d14a7eaa3e35c9b03f3c6a01ae8712ded569 100644

patches/unapplied/server/0024-Ignore-useless-entity-packets.patch → patches/server/0022-Ignore-useless-entity-packets.patch

@@ -7,10 +7,10 @@ Subject: [PATCH] Ignore useless entity packets
 - PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index cf098d4a3111771c13766285c5ec5f1fc1f539a4..433e9a06db191f8a0ff6c23d1ac6122606e67959 100644
+index b86ae3929ec5d3c4eb69d92774dc445aa5b3093e..44e4a768a0ccde83cae5547c7ba07744cec4c693 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -207,6 +207,8 @@ public class ServerEntity {
+@@ -205,6 +205,8 @@ public class ServerEntity {
                          flag4 = true;
                          flag5 = true;
                      }
@@ -19,7 +19,7 @@ index cf098d4a3111771c13766285c5ec5f1fc1f539a4..433e9a06db191f8a0ff6c23d1ac61226
                  }
 
                  if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-@@ -281,6 +283,19 @@ public class ServerEntity {
+@@ -288,6 +290,19 @@ public class ServerEntity {
          });
      }
 

patches/unapplied/server/0026-Configurable-entity-sensor-tick.patch → patches/server/0023-Configurable-entity-sensor-tick.patch

@@ -5,22 +5,22 @@ Subject: [PATCH] Configurable entity sensor tick
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 41ee792f572b13054084b9ad6c6e4cf67ed10290..0d83baabdfabff925c11d363a78414afebe513d3 100644
+index 274ca06fbda0f54805fc82614d43b6e1a4a5d4a8..688f3c01cb939a6c959efbb3b59ac8ee60db3633 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -938,10 +938,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
-         }
-         // Paper end - Allow nerfed mobs to jump and float
-         //this.level().getProfiler().push("sensing"); // Purpur
+@@ -995,10 +995,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
+         //ProfilerFiller gameprofilerfiller = this.level().getProfiler(); // Purpur
+
+         //gameprofilerfiller.push("sensing"); // Purpur
 -        this.sensing.tick();
 +        //this.sensing.tick(); // Plazma - Moved down
-         //this.level().getProfiler().pop(); // Purpur
-         int i = this.level().getServer().getTickCount() + this.getId();
+         //gameprofilerfiller.pop(); // Purpur
+         int i = this.tickCount + this.getId();
 
 +        if (i % this.level().plazmaConfig().entity.sensorTick == 0) this.sensing.tick(); // Plazma - Configurable entity sensor tick
          if (i % 2 != 0 && this.tickCount > 1) {
-             //this.level().getProfiler().push("targetSelector"); // Purpur
-             if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
+             //gameprofilerfiller.push("targetSelector"); // Purpur
+             this.targetSelector.tickRunningGoals(false);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 index c8a3e91d0d6510b519e927027f5a534cddf7d0a3..bc283729cab4df2c596febf1df54241571227564 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java

patches/unapplied/server/0027-Configurable-cave-lava-sea-level.patch → patches/server/0024-Configurable-cave-lava-sea-level.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable cave lava sea level
 This patch also fix MC-237017.
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-index 98c7f695093acbcf9382a5f07a7a89e373709763..a85b1ebb4236f131b9be0104c4aa56f22e661441 100644
+index 8ce870a5341a61fbbaf42021ef7f7f615a6a3e09..e3990d5f5a49aca501289e92f7462a5f2709db9b 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 @@ -72,6 +72,15 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {

patches/unapplied/server/0028-Variable-entity-wakeup-duration.patch → patches/server/0025-Variable-entity-wakeup-duration.patch

@@ -30,10 +30,10 @@ index bc283729cab4df2c596febf1df54241571227564..1e7c23c8851ba1d0f37d2b17fd334220
 
      public Structure structure;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 56e52b16b419c882440a15947f037ae1a902bc70..583647f6c9ca0fb092f30c97693bd548f692dfd3 100644
+index de2b469f06f6679aed1d20156052bfbef5e7c30b..ebd0764dde2e1d79fb41b5d881990ee07a0590b1 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -68,29 +68,36 @@ public class ActivationRange
+@@ -64,29 +64,36 @@ public class ActivationRange
          Activity.PANIC
      };
 

patches/unapplied/server/0029-Optimise-state-lookup-more.patch → patches/server/0026-Optimise-state-lookup-more.patch

@@ -17,10 +17,10 @@ index 57d0cd3ad6f972e986c72a57f1a6e36003f190c2..50d97c5ab33f33b81dbafd7cf42da5af
 
      public ZeroCollidingReferenceStateTable(final StateHolder<?, ?> state, final Map<Property<?>, Comparable<?>> this_map) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
-index 2630f54d499abbe52798f97c8ea14a8d0bd75e99..014ccbafd8beecb7f3bfeea0cdaa6627a81796bd 100644
+index 45744d86e9582a93a0cec26009deea091080fbbe..5dd9473c55a08a775aa406901a0e54ef6f63837a 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
-@@ -115,6 +115,12 @@ public abstract class StateHolder<O, S> {
+@@ -114,6 +114,12 @@ public abstract class StateHolder<O, S> {
      }
 
      public <T extends Comparable<T>, V extends T> S trySetValue(Property<T> property, V value) {
@@ -33,7 +33,7 @@ index 2630f54d499abbe52798f97c8ea14a8d0bd75e99..014ccbafd8beecb7f3bfeea0cdaa6627
          Comparable<?> comparable = this.values.get(property);
          if (comparable != null && !comparable.equals(value)) {
              S object = this.neighbours.get(property, value);
-@@ -126,10 +132,11 @@ public abstract class StateHolder<O, S> {
+@@ -125,10 +131,11 @@ public abstract class StateHolder<O, S> {
          } else {
              return (S)this;
          }
@@ -46,7 +46,7 @@ index 2630f54d499abbe52798f97c8ea14a8d0bd75e99..014ccbafd8beecb7f3bfeea0cdaa6627
              throw new IllegalStateException();
          } else {
              Table<Property<?>, Comparable<?>, S> table = HashBasedTable.create();
-@@ -144,7 +151,7 @@ public abstract class StateHolder<O, S> {
+@@ -143,7 +150,7 @@ public abstract class StateHolder<O, S> {
                  }
              }
 

patches/unapplied/server/0030-Suppress-errors-from-dirty-attributes.patch → patches/server/0027-Suppress-errors-from-dirty-attributes.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Suppress errors from dirty attributes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 433e9a06db191f8a0ff6c23d1ac6122606e67959..149ea6b62c88200ecfc50c825a1dcdffa56d9fcb 100644
+index 44e4a768a0ccde83cae5547c7ba07744cec4c693..7954be9d04d88444601144bab560701c04274aa7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -404,7 +404,8 @@ public class ServerEntity {
+@@ -406,7 +406,8 @@ public class ServerEntity {
          }
 
          if (this.entity instanceof LivingEntity) {
@@ -18,7 +18,7 @@ index 433e9a06db191f8a0ff6c23d1ac6122606e67959..149ea6b62c88200ecfc50c825a1dcdff
 
              if (!set.isEmpty()) {
                  // CraftBukkit start - Send scaled max health
-@@ -415,7 +416,7 @@ public class ServerEntity {
+@@ -417,7 +418,7 @@ public class ServerEntity {
                  this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set));
              }