Updated Upstream (Gale)

Winds-Studio · Jul 30, 2023 · 80409aa · 80409aa
1 parent 59c806a
commit 80409aa
Show file tree

Hide file tree

Showing 20 changed files with 95 additions and 413 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.20.1-R0.1-SNAPSHOT
 
-galeCommit = 216520aaf685733687e20a0d49f3f60d98b227f0
+galeCommit = 28e266d7d0bef890cc087bb83f413cfb54ccd489
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch
@@ -320,7 +320,7 @@ index 03b47012447430a350e152920f754d993d4023db..3ad843d519e239430c5f4f5754a8da30
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 4d014215dce2c2ff09a2701accf2db144603c55a..8cb7000bc5e4e3c987cb0ac73d113eedb141e178 100644
+index 08ae501e97ae2a3f22b1994c9616fc7134cfc0c3..e2c3271c4b7b8eb5ac14ffd1c4492a4d3c17123c 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -476,4 +476,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -1036,10 +1036,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d9482f6eed0b68772d33f861e43181b9453e9581..9f7cb126d38429d9ad459c3c1fa516f7846ee779 100644
+index 760e6f96d3c43d6ab3d4e2e147a3472724c9ec25..466a2164328bbd2e3cf46d3b71dbf1627216aa92 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3165,4 +3165,143 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3187,4 +3187,143 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

diff --git a/patches/api/0006-KeYi-Player-Skull-API.patch b/patches/api/0006-KeYi-Player-Skull-API.patch
@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9f7cb126d38429d9ad459c3c1fa516f7846ee779..122f1039300ef1b33570c6d58e798c14f02670d4 100644
+index 466a2164328bbd2e3cf46d3b71dbf1627216aa92..bf3d39ab87b4cdfdd609fbb28c1d613940404999 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -6,8 +6,11 @@ import java.util.Collection;
@@ -23,7 +23,7 @@ index 9f7cb126d38429d9ad459c3c1fa516f7846ee779..122f1039300ef1b33570c6d58e798c14
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -3304,4 +3307,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3326,4 +3329,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          sendDeathScreen(message);
      }
      // Purpur end

diff --git a/patches/api/0007-Slice-Smooth-Teleports.patch b/patches/api/0007-Slice-Smooth-Teleports.patch
@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 122f1039300ef1b33570c6d58e798c14f02670d4..cfef295eef8a893dd7337782f7d307791b4fa20b 100644
+index bf3d39ab87b4cdfdd609fbb28c1d613940404999..696a59845a638bf20559843f6da53324977283df 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3050,6 +3050,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3072,6 +3072,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
 

diff --git a/patches/api/0008-PaperPR-Fix-BanList-API.patch b/patches/api/0008-PaperPR-Fix-BanList-API.patch
diff --git a/...009-Revert-Purpur-Fire-Immunity-API.patch → ...008-Revert-Purpur-Fire-Immunity-API.patch b/...009-Revert-Purpur-Fire-Immunity-API.patch → ...008-Revert-Purpur-Fire-Immunity-API.patch
diff --git a/patches/server/0008-Pufferfish-Entity-TTL.patch b/patches/server/0008-Pufferfish-Entity-TTL.patch
@@ -7,10 +7,10 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b818da9c6f0617b93ab5f5979c9fd4f3797bc7d8..f7a6e6557e60cc1ac685d07900f0bc75cda0d2b5 100644
+index aa0ed8ab417d15c31971e8adb99842e77adf0c58..9806386175885ed8b9fa4f231aee19fea562420d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -828,6 +828,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -827,6 +827,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public void tick() {