9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-06 15:51:33 +00:00

feat: temp merge

This commit is contained in:
MC_XiaoHei
2025-09-25 16:26:07 +08:00
parent c3b0b6dff7
commit dfd1125354
19 changed files with 139 additions and 146 deletions

View File

@@ -5,13 +5,13 @@ Subject: [PATCH] Bytebuf API
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index 190b5cce7e348c18612ba67eeca3ab19826e59fc..8f62978123dc40bbbc2f9e398a063000317dc655 100644
index 39e624aca0cc803b682ea8d2304dcd86480265bb..6fb2170c777ca0ac333f9663beb43644120cc9d6 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -385,6 +385,13 @@ public abstract class PlayerList {
boolean _boolean = gameRules.getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN);
boolean _boolean1 = gameRules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
boolean _boolean2 = gameRules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
@@ -289,6 +289,13 @@ public abstract class PlayerList {
boolean _boolean = gameRules.getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN);
boolean _boolean1 = gameRules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
boolean _boolean2 = gameRules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
+
+ // Leaves start - Bytebuf API
+ if (!(player instanceof org.leavesmc.leaves.bot.ServerBot) && !(player instanceof org.leavesmc.leaves.replay.ServerPhotographer)) {
@@ -19,6 +19,6 @@ index 190b5cce7e348c18612ba67eeca3ab19826e59fc..8f62978123dc40bbbc2f9e398a063000
+ }
+ // Leaves end - Bytebuf API
+
serverGamePacketListenerImpl.send(
new ClientboundLoginPacket(
player.getId(),
serverGamePacketListenerImpl.send(
new ClientboundLoginPacket(
player.getId(),