Updated Upstream (Purpur)

SoSeDiKs-Universe · Sep 15, 2024 · b9ffebf · b9ffebf
1 parent e8d2679
commit b9ffebf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.21.1-R0.1-SNAPSHOT
 mcVersion = 1.21.1
 
 # Upstream commit
-purpurCommit = dee41bc8c48e9ed535cfa3bf853846450506f001
+purpurCommit = fdfc12e8c70874dd6b438dfb1d77b87dbcebb0c9
 
 # Gradle
 org.gradle.caching = true

diff --git a/patches/server/0006-Add-Kiterino-configs.patch b/patches/server/0006-Add-Kiterino-configs.patch
@@ -133,10 +133,10 @@ index 0000000000000000000000000000000000000000..6c77d9c7583ea95e0ad7ffba4aecccb3
 +}
 diff --git a/src/main/java/me/sosedik/kiterino/KiterinoWorldConfig.java b/src/main/java/me/sosedik/kiterino/KiterinoWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..54b1af069c31532e1fc66a065cb83681e4aaaf4c
+index 0000000000000000000000000000000000000000..0e430c0915012eb55ad9f656565499a9071b2064
 --- /dev/null
 +++ b/src/main/java/me/sosedik/kiterino/KiterinoWorldConfig.java
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,19 @@
 +package me.sosedik.kiterino;
 +
 +import org.bukkit.World;
@@ -146,6 +146,7 @@ index 0000000000000000000000000000000000000000..54b1af069c31532e1fc66a065cb83681
 +
 +    public KiterinoWorldConfig(@NotNull String worldName, @NotNull World.Environment environment) {
 +        super(KiterinoConfig.config, worldName, environment);
++        init();
 +    }
 +
 +    @Override
@@ -157,10 +158,10 @@ index 0000000000000000000000000000000000000000..54b1af069c31532e1fc66a065cb83681
 +}
 diff --git a/src/main/java/me/sosedik/kiterino/WorldConfig.java b/src/main/java/me/sosedik/kiterino/WorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2847457b5ac30d4b4130547ea6b05763fdfc0025
+index 0000000000000000000000000000000000000000..589f413cb6d6b0ff8acb4ca7bb7a727d5f59a140
 --- /dev/null
 +++ b/src/main/java/me/sosedik/kiterino/WorldConfig.java
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,52 @@
 +package me.sosedik.kiterino;
 +
 +import org.bukkit.World;
@@ -180,7 +181,6 @@ index 0000000000000000000000000000000000000000..2847457b5ac30d4b4130547ea6b05763
 +        this.config = config;
 +        this.worldName = worldName;
 +        this.environment = environment;
-+        init();
 +    }
 +
 +    public abstract void init();

diff --git a/patches/server/0038-Bats-ignore-invisible-players.patch b/patches/server/0038-Bats-ignore-invisible-players.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Bats ignore invisible players
 Invisible by API, not via potion effects
 
 diff --git a/src/main/java/me/sosedik/kiterino/KiterinoWorldConfig.java b/src/main/java/me/sosedik/kiterino/KiterinoWorldConfig.java
-index 54b1af069c31532e1fc66a065cb83681e4aaaf4c..deadd404912371b7968250015b4b563615ca5ebc 100644
+index 0e430c0915012eb55ad9f656565499a9071b2064..2979eb09eee76d5b54e118bf5ce7d39ccc6d5eb3 100644
 --- a/src/main/java/me/sosedik/kiterino/KiterinoWorldConfig.java
 +++ b/src/main/java/me/sosedik/kiterino/KiterinoWorldConfig.java
-@@ -15,4 +15,9 @@ public final class KiterinoWorldConfig extends WorldConfig {
+@@ -16,4 +16,9 @@ public final class KiterinoWorldConfig extends WorldConfig {
          KiterinoConfig.readConfig(KiterinoWorldConfig.class, this);
      }