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

Update Paper

Browse Source
This commit is contained in:
violetc
2023-04-04 23:27:25 +08:00
parent a87b8a83da
commit 1b617b0950
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,5 +4,5 @@ version=1.19.4-R0.1-SNAPSHOT
mcVersion=1.19.4
packageVersion=1_19_R3
org.gradle.jvmargs=-Xmx2G
paperRef=1704bf782e876e079ec6bb9573d3416389a05572
paperRef=641dafd0a85badcfc5da7f53a99e5f7eac4ec015
preVersion=false

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

@@ -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 c0c14766adaac855112f85a203a6163b8adfdded..ae761e2e5980ec484203ce72059463934fa3fb49 100644
index a1096ea424c0724af93a2dc65512ee71f4a0bf72..568bb0b6da9936d4efefa6e0bcab407c4735f516 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,7 +114,7 @@ index c0c14766adaac855112f85a203a6163b8adfdded..ae761e2e5980ec484203ce7205946393
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.event.player.PlayerJoinEvent;
@@ -328,6 +329,18 @@ public abstract class PlayerList {
@@ -332,6 +333,18 @@ public abstract class PlayerList {
return;
}
@@ -133,7 +133,7 @@ index c0c14766adaac855112f85a203a6163b8adfdded..ae761e2e5980ec484203ce7205946393
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
@@ -1072,11 +1085,16 @@ public abstract class PlayerList {
@@ -1076,11 +1089,16 @@ public abstract class PlayerList {
}
public String[] getPlayerNamesArray() {
@@ -151,7 +151,7 @@ index c0c14766adaac855112f85a203a6163b8adfdded..ae761e2e5980ec484203ce7205946393
return astring;
}
@@ -1540,4 +1558,16 @@ public abstract class PlayerList {
@@ -1544,4 +1562,16 @@ public abstract class PlayerList {
public boolean isAllowCheatsForAllPlayers() {
return this.allowCheatsForAllPlayers;
}

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

@@ -5,7 +5,7 @@ Subject: [PATCH] No chat sign
diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
index 4d9bc4a62ebae0f3707900503576c64733de639f..95b8bd748abe3dcb05a9bd05e45391934a0b2771 100644
index 951a7df30bd70bb3051c04f592529d560be6948e..16f2e51ed08eddcba8757212088b6ce91fcd9749 100644
--- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
@@ -353,7 +353,7 @@ public final class ChatProcessor {
@@ -123,10 +123,10 @@ index cd0f05aa0f2720d450ee1b975648e73dc22ac9a5..90d284192f27a69f6694544c885c3e4d
protected boolean convertOldUsers() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d587b2c4e39bce7e098aa9fab361230f72770658..95097161655d9b3ec6b7daa1c8f719268bd856c5 100644
index 177aac1ab10189bb5a52217e86ba5c8a535b4197..710640b909def47b69fe241f373b103682bc2b76 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2133,10 +2133,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2141,10 +2141,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void send(Packet<?> packet) {
@@ -155,10 +155,10 @@ index d587b2c4e39bce7e098aa9fab361230f72770658..95097161655d9b3ec6b7daa1c8f71926
if (packet == null || this.processedDisconnect) { // Spigot
return;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index ae761e2e5980ec484203ce72059463934fa3fb49..594b50d2a30e3366aa1b9a6fde390af4451f720c 100644
index 568bb0b6da9936d4efefa6e0bcab407c4735f516..c1800d26f6ea3ff4cef7ad53a808b419f1fa4112 100644
--- a/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 {
@@ -1438,7 +1438,7 @@ public abstract class PlayerList {
}
public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public

6
patches/server/0040-Cache-climbing-check-for-activation.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Cache climbing check for activation
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 029f456504f0229a564af937e30329ca08a1b5f9..454495e3e1d432553762f36c18ec290fe13425c0 100644
index 0fea7b506a65d21161a538c68579982a98ca98c7..557a92bfaecf3f1bddd4c602a26a7d5373f9798d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1938,6 +1938,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -33,10 +33,10 @@ index 029f456504f0229a564af937e30329ca08a1b5f9..454495e3e1d432553762f36c18ec290f
if (this.isSpectator()) {
return false;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index e881584d38dc354204479863f004e974a0ac6c07..9f17c6acb54a7620656832df62e57e9d447c7ffc 100644
index 52780192d6417f8085566e4cdf3a895a83638520..eeb3522c39dde84e497d22758e90b42f3a2d5a96 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -291,7 +291,7 @@ public class ActivationRange
@@ -292,7 +292,7 @@ public class ActivationRange
if ( entity instanceof LivingEntity )
{
LivingEntity living = (LivingEntity) entity;

8
patches/server/0045-PCA-sync-protocol.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 95097161655d9b3ec6b7daa1c8f719268bd856c5..d9e337409b45a2b0d00e8411e257cf6c2824de44 100644
index 710640b909def47b69fe241f373b103682bc2b76..1ca5f2c544b3c7e0bb2b45a4b2ea1d1c71b18dfb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -243,6 +243,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index 95097161655d9b3ec6b7daa1c8f719268bd856c5..d9e337409b45a2b0d00e8411e257cf6c
// CraftBukkit end
public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
@@ -3566,6 +3567,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3574,6 +3575,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
}
} else {
@@ -35,10 +35,10 @@ index 95097161655d9b3ec6b7daa1c8f719268bd856c5..d9e337409b45a2b0d00e8411e257cf6c
byte[] data = new byte[packet.data.readableBytes()];
packet.data.readBytes(data);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 594b50d2a30e3366aa1b9a6fde390af4451f720c..2c4b2d02b9ac44bb280af35f60defc97bb989b21 100644
index c1800d26f6ea3ff4cef7ad53a808b419f1fa4112..2be065c247afd4483afe27ceebc965393f843982 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -340,6 +340,7 @@ public abstract class PlayerList {
@@ -344,6 +344,7 @@ public abstract class PlayerList {
bot1.render(playerconnection, true,player.getBukkitEntity().getWorld() == bot1.getBukkitEntity().getWorld())); // Leaves - render bot
}
// Leaves end - bot support

12
patches/server/0046-BBOR-Protocol.patch
View File

@@ -18,10 +18,10 @@ index 13fd9744adfa5459a24fedcc6359b11e125eff42..a8c580c9e8ee099af1869c9aa42d3e6a
for (int i = 0; i < this.tickables.size(); ++i) {
((Runnable) this.tickables.get(i)).run();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d9e337409b45a2b0d00e8411e257cf6c2824de44..032bb9ce8a3c0e7af3847721448608ebcd6a82cb 100644
index 1ca5f2c544b3c7e0bb2b45a4b2ea1d1c71b18dfb..221bc8da4bf4df53e1b991139eb48461f7de3c57 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3572,6 +3572,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3580,6 +3580,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (top.leavesmc.leaves.LeavesConfig.pcaSyncProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.PcaSyncProtocol.PROTOCOL_ID)) {
top.leavesmc.leaves.protocol.PcaSyncProtocol.handlePacket(server, player, packet);
}
@@ -32,10 +32,10 @@ index d9e337409b45a2b0d00e8411e257cf6c2824de44..032bb9ce8a3c0e7af3847721448608eb
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
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
index 2c4b2d02b9ac44bb280af35f60defc97bb989b21..394c168686bc7704f559a64bca8508dacbdc15c0 100644
index 2be065c247afd4483afe27ceebc965393f843982..c7cf8ba0b69be3dc55cc76ccc69b110eebd998c5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -341,6 +341,7 @@ public abstract class PlayerList {
@@ -345,6 +345,7 @@ public abstract class PlayerList {
}
// Leaves end - bot support
top.leavesmc.leaves.protocol.PcaSyncProtocol.onJoin(player); // Leaves - pca
@@ -43,7 +43,7 @@ index 2c4b2d02b9ac44bb280af35f60defc97bb989b21..394c168686bc7704f559a64bca8508da
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
@@ -584,6 +585,7 @@ public abstract class PlayerList {
@@ -588,6 +589,7 @@ public abstract class PlayerList {
return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName())));
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
@@ -51,7 +51,7 @@ index 2c4b2d02b9ac44bb280af35f60defc97bb989b21..394c168686bc7704f559a64bca8508da
// Paper end
ServerLevel worldserver = entityplayer.getLevel();
@@ -1553,7 +1555,7 @@ public abstract class PlayerList {
@@ -1557,7 +1559,7 @@ public abstract class PlayerList {
entityplayer.connection.send(packetplayoutrecipeupdate);
entityplayer.getRecipeBook().sendInitialRecipeBook(entityplayer);
}

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Jade Protocol
This patch is Powered by Jade(https://github.com/Snownee/Jade)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 032bb9ce8a3c0e7af3847721448608ebcd6a82cb..b60e059afdd44b120ec9ad37855160b3aab4478c 100644
index 221bc8da4bf4df53e1b991139eb48461f7de3c57..aba3f4655bdb830ca3fb7e4009d3fc7bdb207f85 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3575,6 +3575,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3583,6 +3583,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (top.leavesmc.leaves.LeavesConfig.bborProtocol && packet.identifier.equals(top.leavesmc.leaves.protocol.BBORProtocol.SUBSCRIBE)) {
top.leavesmc.leaves.protocol.BBORProtocol.onPlayerSubscribed(player);
}
@@ -20,10 +20,10 @@ index 032bb9ce8a3c0e7af3847721448608ebcd6a82cb..b60e059afdd44b120ec9ad37855160b3
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
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
index 394c168686bc7704f559a64bca8508dacbdc15c0..ecc44d115bffcf37284cee0ebd37610d0567581f 100644
index c7cf8ba0b69be3dc55cc76ccc69b110eebd998c5..5c683b104be411e0a860aa3a5c777c87ab4a4f6c 100644
--- a/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 {
@@ -346,6 +346,7 @@ public abstract class PlayerList {
// Leaves end - bot support
top.leavesmc.leaves.protocol.PcaSyncProtocol.onJoin(player); // Leaves - pca
top.leavesmc.leaves.protocol.BBORProtocol.onPlayerLoggedIn(player); // Leaves - bbor

4
patches/server/0050-Carpet-alternative-block-placement-Protocol.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Carpet alternative block placement Protocol
This patch is Powered by carpet-extra(https://github.com/gnembon/carpet-extra)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index eb2ff842a1b8534d4d23e1303010c51af2ecaafc..ef46f5e8d425703a71064a8afe2115a5e98c29fa 100644
index aba3f4655bdb830ca3fb7e4009d3fc7bdb207f85..2d7a97b5e0c44d571c59fa8889992be71fb9efc2 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1938,7 +1938,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1946,7 +1946,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
Vec3 vec3d2 = vec3d.subtract(vec3d1);
double d0 = 1.0000001D;

4
patches/server/0056-Return-nether-portal-fix.patch
View File

@@ -74,7 +74,7 @@ index 741ec2c1be0661f503e246d1c16b3ac97b1fa2e4..9c4df8ba64afd52cf9e0c9be5016c0d0
return optional;
} else {
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index ecc44d115bffcf37284cee0ebd37610d0567581f..6ee9356820c052eb80d05d270c9199e74fb7b6be 100644
index 5c683b104be411e0a860aa3a5c777c87ab4a4f6c..629dc9f968b40154f67d9a7f3b0116fce82af7bf 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -27,6 +27,8 @@ import java.util.UUID;
@@ -94,7 +94,7 @@ index ecc44d115bffcf37284cee0ebd37610d0567581f..6ee9356820c052eb80d05d270c9199e7
// CraftBukkit end
public abstract class PlayerList {
@@ -966,6 +969,24 @@ public abstract class PlayerList {
@@ -970,6 +973,24 @@ public abstract class PlayerList {
if (fromWorld != location.getWorld()) {
PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(entityplayer.getBukkitEntity(), fromWorld);
server.server.getPluginManager().callEvent(event);

6
patches/server/0057-Appleskin-Protocol.patch
View File

@@ -17,10 +17,10 @@ index a8c580c9e8ee099af1869c9aa42d3e6aaba720e4..eddb0f942d9104f9a623df843a3861d9
MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
for (int i = 0; i < this.tickables.size(); ++i) {
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 6ee9356820c052eb80d05d270c9199e74fb7b6be..56bf504613bfb576c6183ea8a90b7197ceacb749 100644
index 629dc9f968b40154f67d9a7f3b0116fce82af7bf..5e0241750e07f7f088b478bf52130c23cb5cd281 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -346,6 +346,7 @@ public abstract class PlayerList {
@@ -350,6 +350,7 @@ public abstract class PlayerList {
top.leavesmc.leaves.protocol.PcaSyncProtocol.onJoin(player); // Leaves - pca
top.leavesmc.leaves.protocol.BBORProtocol.onPlayerLoggedIn(player); // Leaves - bbor
top.leavesmc.leaves.protocol.JadeProtocol.onPlayerJoin(player); // Leaves - Jade
@@ -28,7 +28,7 @@ index 6ee9356820c052eb80d05d270c9199e74fb7b6be..56bf504613bfb576c6183ea8a90b7197
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
@@ -590,6 +591,7 @@ public abstract class PlayerList {
@@ -594,6 +595,7 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
top.leavesmc.leaves.protocol.BBORProtocol.onPlayerLoggedOut(entityplayer); // Leaves - bbor

4
patches/server/0058-Xaero-Map-Protocol.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Xaero Map Protocol
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 4a4406821c4bf7fb2ea3e6a2d5e824094c2497d0..9efb5b472f47cbc938902199d44efa50d79e2427 100644
index 5e0241750e07f7f088b478bf52130c23cb5cd281..cb0ad0857f6910036a796e22677579d72c12c020 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1278,6 +1278,7 @@ public abstract class PlayerList {
@@ -1282,6 +1282,7 @@ public abstract class PlayerList {
player.connection.send(new ClientboundInitializeBorderPacket(worldborder));
player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle()));