Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-23 08:59:31 +00:00
Code Issues Releases Activity

Fix Bukkit player getter (#33)

Browse Source
This commit is contained in:
violetc
2023-05-15 00:22:13 +08:00
parent 716855eef4
commit c4aa94426f
8 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0009-Fakeplayer-support.patch
View File

@@ -61,7 +61,7 @@ index 26888ebd38280de92e41dd8006d2b24e874afe26..a1ce0cce055ad5c92b0f20760471795f
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
boolean flag1 = advancementprogress.isDone();
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1d4d02f26391ac55c7631817f09d05e2769b0d29..0043261e4fc1c7de6281b9b150f71aa9c2494aa1 100644
index a0053455eaeca04855b689f3b00b78dac39d08e3..fa1125c32f601e67fa3f9a1912b430cf975a1af8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -183,6 +183,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -87,7 +87,7 @@ index 1d4d02f26391ac55c7631817f09d05e2769b0d29..0043261e4fc1c7de6281b9b150f71aa9
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..9396de2ab4d04689476467622cbdba535ed15044 100644
index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..18fde115b543f6db866779f20f363fab8d569dd6 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -81,6 +81,7 @@ import net.minecraft.server.ServerScoreboard;
@@ -114,17 +114,18 @@ index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..9396de2ab4d04689476467622cbdba53
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.event.player.PlayerJoinEvent;
@@ -333,6 +334,18 @@ public abstract class PlayerList {
@@ -333,6 +334,19 @@ public abstract class PlayerList {
return;
}
+ // Leaves start - bot support
+ if (top.leavesmc.leaves.LeavesConfig.fakeplayerSupport) {
+ ServerBot bot = ServerBot.getBot(player.getName().getString());
+ ServerBot bot = ServerBot.getBot(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT));
+ if (bot != null) {
+ bot.die(bot.damageSources().outOfWorld()); // Leaves - remove bot with the same name
+ this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player);
+ this.playersByUUID.put(player.getUUID(), player);
+ }
+
+ ServerBot.getBots().forEach(bot1 ->
+ bot1.render(playerconnection, true,player.getBukkitEntity().getWorld() == bot1.getBukkitEntity().getWorld())); // Leaves - render bot
+ }
@@ -133,7 +134,7 @@ index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..9396de2ab4d04689476467622cbdba53
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
@@ -1077,11 +1090,16 @@ public abstract class PlayerList {
@@ -1077,11 +1091,16 @@ public abstract class PlayerList {
}
public String[] getPlayerNamesArray() {
@@ -151,7 +152,7 @@ index 4d837c1530a3031a4c2a5a39d87bd013d60e14a6..9396de2ab4d04689476467622cbdba53
return astring;
}
@@ -1545,4 +1563,16 @@ public abstract class PlayerList {
@@ -1545,4 +1564,16 @@ public abstract class PlayerList {
public boolean isAllowCheatsForAllPlayers() {
return this.allowCheatsForAllPlayers;
}