From 9431e8cde3a2e4853bdec57bb88984db520a579f Mon Sep 17 00:00:00 2001
From: MC_XiaoHei <xor7xiaohei@gmail.com>
Date: Thu, 25 Sep 2025 17:30:02 +0800
Subject: [PATCH] feat: fix some error

---
 .../src/main/java/org/leavesmc/leaves/bot/BotList.java      | 6 +++---
 .../leaves/bot/agent/actions/ServerMountAction.java         | 2 +-
 .../java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java  | 4 ++--
 .../org/leavesmc/leaves/protocol/rei/REIServerProtocol.java | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java
index 9a7ba737..2727c985 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java
@@ -154,7 +154,7 @@ public class BotList {
         this.botsByName.put(bot.getScoreboardName().toLowerCase(Locale.ROOT), bot);
         this.botsByUUID.put(bot.getUUID(), bot);
 
-        bot.supressTrackerForLogin = true;
+        bot.suppressTrackerForLogin = true;
         world.addNewPlayer(bot);
         optional.ifPresent(nbt -> {
             bot.loadAndSpawnEnderPearls(nbt);
@@ -170,7 +170,7 @@ public class BotList {
         }
 
         bot.renderInfo();
-        bot.supressTrackerForLogin = false;
+        bot.suppressTrackerForLogin = false;
 
         bot.level().getChunkSource().chunkMap.addEntity(bot);
         bot.renderData();
@@ -345,7 +345,7 @@ public class BotList {
 
         public void setSkin(String[] skin) {
             if (skin != null) {
-                this.getProperties().put("textures", new Property("textures", skin[0], skin[1]));
+                this.properties().put("textures", new Property("textures", skin[0], skin[1]));
             }
         }
     }
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java
index c4a4a440..e9a1c903 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java
@@ -30,7 +30,7 @@ public class ServerMountAction extends ServerBotAction<ServerMountAction> {
         )).toList();
 
         for (Vehicle vehicle : vehicles) {
-            if (bot.startRiding(((CraftEntity) vehicle).getHandle(), false)) {
+            if (bot.startRiding(((CraftEntity) vehicle).getHandle(), false, true)) {
                 return true;
             }
         }
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java
index 5a8483f1..22d352a9 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/PcaSyncProtocol.java
@@ -142,12 +142,12 @@ public class PcaSyncProtocol implements LeavesProtocol {
                             }
                         }
                         case OPS -> {
-                            if (!(entity instanceof ServerBot) && !server.getPlayerList().isOp(player.gameProfile)) {
+                            if (!(entity instanceof ServerBot) && !server.getPlayerList().isOp(player.nameAndId())) {
                                 return;
                             }
                         }
                         case OPS_AND_SELF -> {
-                            if (!(entity instanceof ServerBot) && !server.getPlayerList().isOp(player.gameProfile) && entity != player) {
+                            if (!(entity instanceof ServerBot) && !server.getPlayerList().isOp(player.nameAndId()) && entity != player) {
                                 return;
                             }
                         }
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java
index 444aadec..52b21c1c 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java
@@ -193,7 +193,7 @@ public class REIServerProtocol implements LeavesProtocol {
             }
         } else if (channel.equals("ci_msg")) {
             // cheat rei-client into using "delete_item" packet
-            if (MinecraftServer.getServer().getProfilePermissions(player.getGameProfile()) < 1) {
+            if (MinecraftServer.getServer().getProfilePermissions(player.nameAndId()) < 1) {
                 player.getBukkitEntity().sendOpLevel((byte) 1);
             }
         }