From 144e45c2731ea5149feb4844b73ab5b98695047e Mon Sep 17 00:00:00 2001
From: Gabriel Harris-Rouquette <gabizou@me.com>
Date: Wed, 2 Oct 2024 23:48:01 -0700
Subject: [PATCH] chore(update): update to 24w39a

Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>
---
 src/main/java/org/spongepowered/api/entity/Entity.java |  4 ++++
 .../ai/goal/builtin/creature/AvoidLivingGoal.java      | 10 ++++++++--
 .../world/server/storage/ServerWorldProperties.java    |  3 ++-
 .../api/world/storage/WorldProperties.java             |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/spongepowered/api/entity/Entity.java b/src/main/java/org/spongepowered/api/entity/Entity.java
index 2f39680f34..10f3250a41 100644
--- a/src/main/java/org/spongepowered/api/entity/Entity.java
+++ b/src/main/java/org/spongepowered/api/entity/Entity.java
@@ -292,6 +292,10 @@ default boolean damage(final double damage, final Supplier<? extends DamageSourc
      */
     boolean damage(double damage, DamageSource damageSource);
 
+    default void foo() {
+
+    }
+
     /**
      * Gets the nearby entities within the desired distance.
      *
diff --git a/src/main/java/org/spongepowered/api/entity/ai/goal/builtin/creature/AvoidLivingGoal.java b/src/main/java/org/spongepowered/api/entity/ai/goal/builtin/creature/AvoidLivingGoal.java
index fee7413384..d3ed6ace73 100644
--- a/src/main/java/org/spongepowered/api/entity/ai/goal/builtin/creature/AvoidLivingGoal.java
+++ b/src/main/java/org/spongepowered/api/entity/ai/goal/builtin/creature/AvoidLivingGoal.java
@@ -30,7 +30,9 @@
 import org.spongepowered.api.entity.living.Agent;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.PathfinderAgent;
+import org.spongepowered.api.world.server.ServerWorld;
 
+import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 public interface AvoidLivingGoal extends Goal<PathfinderAgent> {
@@ -52,7 +54,7 @@ static Builder builder() {
      *
      * @return The predicate used to filter which entities to avoid
      */
-    Predicate<Living> targetSelector();
+    BiPredicate<Living, ServerWorld> targetSelector();
 
     /**
      * Sets the {@link Predicate} for filtering which {@link Living} instances
@@ -61,7 +63,11 @@ static Builder builder() {
      * @param predicate The predicate
      * @return This task, for chaining
      */
-    AvoidLivingGoal setTargetSelector(Predicate<Living> predicate);
+    default AvoidLivingGoal setTargetSelector(Predicate<Living> predicate) {
+        return this.setTargetSelector((entity, world) -> predicate.test(entity));
+    }
+
+    AvoidLivingGoal setTargetSelector(BiPredicate<Living, ServerWorld> predicate);
 
     /**
      * Gets the search distance at which any {@link Living} instances in a
diff --git a/src/main/java/org/spongepowered/api/world/server/storage/ServerWorldProperties.java b/src/main/java/org/spongepowered/api/world/server/storage/ServerWorldProperties.java
index 93efda5ece..0b1ffaf810 100644
--- a/src/main/java/org/spongepowered/api/world/server/storage/ServerWorldProperties.java
+++ b/src/main/java/org/spongepowered/api/world/server/storage/ServerWorldProperties.java
@@ -40,6 +40,7 @@
 import org.spongepowered.api.world.WorldType;
 import org.spongepowered.api.world.border.WorldBorder;
 import org.spongepowered.api.world.difficulty.Difficulty;
+import org.spongepowered.api.world.gamerule.GameRuleHolder;
 import org.spongepowered.api.world.generation.config.WorldGenerationConfig;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.api.world.storage.WorldProperties;
@@ -50,7 +51,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-public interface ServerWorldProperties extends WorldProperties, Nameable, Identifiable, ResourceKeyed, WeatherUniverse.Mutable {
+public interface ServerWorldProperties extends WorldProperties, GameRuleHolder, Nameable, Identifiable, ResourceKeyed, WeatherUniverse.Mutable {
 
     /**
      * Gets the {@link ServerWorld} that correlates to this properties, if available.
diff --git a/src/main/java/org/spongepowered/api/world/storage/WorldProperties.java b/src/main/java/org/spongepowered/api/world/storage/WorldProperties.java
index 801ca3ded1..4243fcd663 100644
--- a/src/main/java/org/spongepowered/api/world/storage/WorldProperties.java
+++ b/src/main/java/org/spongepowered/api/world/storage/WorldProperties.java
@@ -36,7 +36,7 @@
 /**
  * Represents the properties of a {@link World} which are persisted across runtime instances.
  */
-public interface WorldProperties extends WeatherUniverse, GameRuleHolder, DataHolder.Mutable {
+public interface WorldProperties extends WeatherUniverse, DataHolder.Mutable {
 
     /**
      * Gets the default spawn position.