#20241122.0

caramel-moe · Nov 22, 2024 · 2a07b45 · 2a07b45
1 parent c41ee70
commit 2a07b45
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/patches/0015-Add-Network-API.patch b/patches/0015-Add-Network-API.patch
@@ -5,23 +5,14 @@ Subject: [PATCH] Add Network API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 630671ba393f61633e1d20051ba791d09dbc6279..8fb0cb9e99023cbe10d4133a75c55a68c098b59a 100644
+index 630671ba393f61633e1d20051ba791d09dbc6279..338beff9bd1b9af59480ad8f0f36ecb11c802402 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -57,6 +57,16 @@ dependencies {
+@@ -57,6 +57,7 @@ dependencies {
      implementation("org.ow2.asm:asm-commons:9.7.1")
      // Paper end
      api("com.mojang:authlib:6.0.54") // Daydream - Add Brigadier Command API (Mojang Authlib; keep in sync with major MC versions)
-+    // Daydream start - Add Network API
-+    val nettyVersion = "4.1.97.Final"
-+    api("io.netty:netty-buffer:$nettyVersion")
-+    api("io.netty:netty-codec:$nettyVersion")
-+    api("io.netty:netty-common:$nettyVersion")
-+    api("io.netty:netty-handler:$nettyVersion")
-+    api("io.netty:netty-resolver:$nettyVersion")
-+    api("io.netty:netty-transport:$nettyVersion")
-+    api("io.netty:netty-transport-classes-epoll:$nettyVersion")
-+    // Daydream end - Add Network API
++    api("io.netty:netty-handler:4.1.97.Final") // Daydream - Add Network API (keep in sync with major MC versions)
 
      api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
      compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
@@ -45,7 +36,7 @@ index c84ce3fc874eea3d8f0b1cf5273996d9b4af6225..f3e044b5529d7aa470c46535c2304ef2
 +    // Daydream end - Add Network API
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bc69882922b588950c08da609705c98ba4005095..ef4f5180a99ba7680a0f07d2d6569dd943e77aed 100644
+index 5fd9eb67baa12f98d0cc4907bfeac83d794f61a0..baa5ae0fd65f3adc7b26f04a5ada30c827abb520 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1036,6 +1036,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM