Updated Upstream (Gale)

Winds-Studio · Jun 16, 2024 · b4b5d0c · b4b5d0c
1 parent 090f29e
commit b4b5d0c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.20.6
 version = 1.20.6-R0.1-SNAPSHOT
 
-galeCommit = cefcdf45a8532f12fb4afb54cbcf0593601537f1
+galeCommit = 886651ccef21e12c941fb8c3304ed7c8a83178e3
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/patches/server/0011-Purpur-Server-Changes.patch b/patches/server/0011-Purpur-Server-Changes.patch
@@ -2692,7 +2692,7 @@ index 09fdea983772612ef3fff6b2da3cf469a34e4ec0..b69d924fa8034eabbf4aab8d3434f4f4
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b4ec32926234ab91a0fa22dd01afe950804aece6..1b092cdccba089684301266a90fe715a55a6f4f8 100644
+index 546ec288ae19597aa9a1ca25430339109a19df81..3fa3191d98f51b447961ac584bebac5ef2c5fbbc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -228,9 +228,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -12629,7 +12629,7 @@ index f5203ef461b3fdb9a63a722fb32cd533e6b46e92..e1300b80a8119844ab572c988061a5d5
              CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer) this, stack);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 04713beb813db3811b468f62e664da25ef3916e8..3166c91c1eda7f338c4095e9140b6401d9af8575 100644
+index 7925eee8f8ed40966af91d2e88991271f56f51db..708085bb13a994e65d7c8ef7ea10aa41951c8ffe 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -77,6 +77,7 @@ public abstract class AbstractArrow extends Projectile {
@@ -17495,7 +17495,7 @@ index 351f42842b780d053cd2e5bad9ae299449141b10..4860574e7fad7a9527dda599703c573c
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 40155cc70ba959eea8011626a30e26f44298c99d..8211ec2c701687d8e5334156772cf435b89f3cb3 100644
+index 32c3c2c6b2eaa90b149d9b425341e75b85bd9764..aac21ff5418f76b0d06b6a49a4021bde194cf1da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -574,10 +574,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -17515,7 +17515,7 @@ index 40155cc70ba959eea8011626a30e26f44298c99d..8211ec2c701687d8e5334156772cf435
          if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
          for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
-@@ -1438,6 +1443,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1439,6 +1444,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
 
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -17526,7 +17526,7 @@ index 40155cc70ba959eea8011626a30e26f44298c99d..8211ec2c701687d8e5334156772cf435
              return false;
          }
 
-@@ -2733,6 +2742,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2734,6 +2743,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
 
@@ -17555,7 +17555,7 @@ index 40155cc70ba959eea8011626a30e26f44298c99d..8211ec2c701687d8e5334156772cf435
      private void validateSpeed(float value) {
          Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
      }
-@@ -3528,4 +3559,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3529,4 +3560,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSendViewDistance(final int viewDistance) {
          this.getHandle().setSendViewDistance(viewDistance);
      }

diff --git a/patches/server/0021-KeYi-Player-Skull-API.patch b/patches/server/0021-KeYi-Player-Skull-API.patch
@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8211ec2c701687d8e5334156772cf435b89f3cb3..055c72f90d235b1aafaf5ddc6b868660bbad9113 100644
+index aac21ff5418f76b0d06b6a49a4021bde194cf1da..20cf62169210ba0a5de45ed68e3453cc63a07102 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3625,4 +3625,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3626,4 +3626,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
      }
      // Purpur end

diff --git a/patches/server/0028-Slice-Smooth-Teleports.patch b/patches/server/0028-Slice-Smooth-Teleports.patch
@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 89200d0e0ff60514d22c1cde4b5222917f066323..3bbb3b5444976c859d7f357aa4283947b45f3100 100644
+index fd3f177012d82fe774069b4c53f7efef3e9b991f..9b97d5ca67c0e53f318a54465708e21ae906e994 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -303,6 +303,7 @@ public class ServerPlayer extends Player {
@@ -36,10 +36,10 @@ index 9250db41e26d2ffa96146782e898165591f9e819..2e98c6598e589b498991c745058db3c0
          entityplayer1.connection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
          entityplayer1.connection.send(new ClientboundSetExperiencePacket(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f2f6184589c72b82d041abae2c978edf084cc63f..bbbac669bcadd596ad40a0eed99e2587db9c900e 100644
+index 20cf62169210ba0a5de45ed68e3453cc63a07102..581ef3deffeb66d5d06951e6eadffb05b26a50c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1347,6 +1347,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1348,6 +1348,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      }
 

diff --git a/patches/server/0058-SparklyPaper-Optimize-canSee-checks.patch b/patches/server/0058-SparklyPaper-Optimize-canSee-checks.patch
@@ -29,7 +29,7 @@ index 822604900ccfe18d8e73c746af2d3d0fc36a2734..a8821f031d85ca66f96aece7c179c40e
                  }
                  // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ff547f908b0390fac7e165c5765f0f9f4d9ce5b8..547bb44769e3cf23cd0fee669d335c37ff15aa92 100644
+index 20307e1566a5f7d2af3887abed8d8e8435b06e97..0d2803a094b48fe864d59c342cc65f480ce747c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -198,7 +198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -41,7 +41,7 @@ index ff547f908b0390fac7e165c5765f0f9f4d9ce5b8..547bb44769e3cf23cd0fee669d335c37
      private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
-@@ -2247,9 +2247,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2248,9 +2248,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {