Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-20 15:29:35 +00:00
Code Issues Releases Activity

Fix some patches

Browse Source
This commit is contained in:
violetc
2023-03-19 22:01:39 +08:00
parent c67a637939
commit c1c929da04
3 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ index ca5291a9573a62cb5c19539cf5c7aceff11f9829..a11b8b93ba9248ea463b7a3a3dcfdcf1
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld()); PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.level.getCraftServer().getPluginManager().callEvent(changeEvent); 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 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index c0c14766adaac855112f85a203a6163b8adfdded..df9f4c0dd69ccd9d02683c1a6302d0b537c64804 100644 index c0c14766adaac855112f85a203a6163b8adfdded..ae761e2e5980ec484203ce72059463934fa3fb49 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/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; @@ -81,6 +81,7 @@ import net.minecraft.server.ServerScoreboard;
@@ -122,7 +122,7 @@ index c0c14766adaac855112f85a203a6163b8adfdded..df9f4c0dd69ccd9d02683c1a6302d0b5
+ if (top.leavesmc.leaves.LeavesConfig.fakeplayerSupport) { + if (top.leavesmc.leaves.LeavesConfig.fakeplayerSupport) {
+ ServerBot bot = ServerBot.getBot(player.getName().getString()); + ServerBot bot = ServerBot.getBot(player.getName().getString());
+ if (bot != null) { + if (bot != null) {
+ bot.die(DamageSource.OUT_OF_WORLD); // Leaves - remove bot with the same name + bot.die(bot.damageSources().outOfWorld()); // Leaves - remove bot with the same name
+ } + }
+ +
+ ServerBot.getBots().forEach(bot1 -> + ServerBot.getBots().forEach(bot1 ->

27
patches/server/0017-No-chat-sign.patch
View File

@@ -108,31 +108,6 @@ index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..2c349dc502ce275a8215766933f4855f
listener.handleChatSessionUpdate(this); listener.handleChatSessionUpdate(this);
} }
} }
diff --git a/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java b/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
index e6cc2bab1fde2e8c1394772b99201ea8d7eb8057..9545760dab2ab7e2a85c00a8b0847b3c4c4c6857 100644
--- a/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
+++ b/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
@@ -26,18 +26,14 @@ public record ServerStatus(Component description, Optional<ServerStatus.Players>
private static final String PREFIX = "data:image/png;base64,";
public static final Codec<ServerStatus.Favicon> CODEC = Codec.STRING.comapFlatMap((uri) -> {
if (!uri.startsWith("data:image/png;base64,")) {
- return DataResult.error(() -> {
- return "Unknown format";
- });
+ return DataResult.error("Unknown format");
} else {
try {
String string = uri.substring("data:image/png;base64,".length()).replaceAll("\n", "");
byte[] bs = Base64.getDecoder().decode(string.getBytes(StandardCharsets.UTF_8));
return DataResult.success(new ServerStatus.Favicon(bs));
} catch (IllegalArgumentException var3) {
- return DataResult.error(() -> {
- return "Malformed base64 server icon";
- });
+ return DataResult.error("Malformed base64 server icon");
}
}
}, (iconBytes) -> {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index cd0f05aa0f2720d450ee1b975648e73dc22ac9a5..90d284192f27a69f6694544c885c3e4d393081bb 100644 index cd0f05aa0f2720d450ee1b975648e73dc22ac9a5..90d284192f27a69f6694544c885c3e4d393081bb 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -179,7 +154,7 @@ index 2d8488b9aa088b6d5f0c7e557b8ad0b29bc4cd88..3e501a731eacda1418009cd21a59cf3d
if (packet == null || this.processedDisconnect) { // Spigot if (packet == null || this.processedDisconnect) { // Spigot
return; return;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index df9f4c0dd69ccd9d02683c1a6302d0b537c64804..f0fd2302519290bade97224373844de7a59a03dd 100644 index ae761e2e5980ec484203ce72059463934fa3fb49..594b50d2a30e3366aa1b9a6fde390af4451f720c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1434,7 +1434,7 @@ public abstract class PlayerList { @@ -1434,7 +1434,7 @@ public abstract class PlayerList {

6
patches/server/0049-Jade-Protocol.patch
View File

@@ -20,7 +20,7 @@ index ec0568956dd2750e84512d0c1d1e85bb4159130f..eb2ff842a1b8534d4d23e1303010c51a
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 3032ae9cbf02f11329a3a29442e8eff1ac9be5e8..6803f21f43da5a5254622d61eba4ab8ddbe25344 100644 index 394c168686bc7704f559a64bca8508dacbdc15c0..ecc44d115bffcf37284cee0ebd37610d0567581f 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -342,6 +342,7 @@ public abstract class PlayerList { @@ -342,6 +342,7 @@ public abstract class PlayerList {
@@ -86,7 +86,7 @@ index 383264142a2b138424fd22a65fb58fb480e721f3..35aab7f3d0d67fdbee2f438070b2a88e
public final String worldName; public final String worldName;
diff --git a/src/main/java/top/leavesmc/leaves/protocol/JadeProtocol.java b/src/main/java/top/leavesmc/leaves/protocol/JadeProtocol.java diff --git a/src/main/java/top/leavesmc/leaves/protocol/JadeProtocol.java b/src/main/java/top/leavesmc/leaves/protocol/JadeProtocol.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..569ccfc9ac059abdc5690e686889ed03047c2517 index 0000000000000000000000000000000000000000..6656c7a35874b3297385c8d9e6637258c4a9979f
--- /dev/null --- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/protocol/JadeProtocol.java +++ b/src/main/java/top/leavesmc/leaves/protocol/JadeProtocol.java
@@ -0,0 +1,572 @@ @@ -0,0 +1,572 @@
@@ -328,7 +328,7 @@ index 0000000000000000000000000000000000000000..569ccfc9ac059abdc5690e686889ed03
+ })); + }));
+ tileDataProviders.register(JukeboxBlockEntity.class, ((data, player, world, object, showDetails) -> { + tileDataProviders.register(JukeboxBlockEntity.class, ((data, player, world, object, showDetails) -> {
+ if (object instanceof JukeboxBlockEntity jukebox) { + if (object instanceof JukeboxBlockEntity jukebox) {
+ ItemStack stack = jukebox.getRecord(); + ItemStack stack = jukebox.getFirstItem();
+ if (!stack.isEmpty()) { + if (!stack.isEmpty()) {
+ data.put("Record", stack.save(new CompoundTag())); + data.put("Record", stack.save(new CompoundTag()));
+ } + }