mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-06 15:51:31 +00:00
Add back Leaves Syncmatica Protocol
This commit is contained in:
2055
patches/server/0034-Leaves-Syncmatica-Protocol.patch
Normal file
2055
patches/server/0034-Leaves-Syncmatica-Protocol.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -6,7 +6,7 @@ Subject: [PATCH] Chat Image protocol
|
||||
This patch is Powered by ChatImage (https://github.com/kitUIN/ChatImage)
|
||||
|
||||
diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
index c159340c3d7d90601bb69a4e1b997e372d48841a..81caf114feeb7b94e984e025b7922cc212da817e 100644
|
||||
index 9bff9c7fce4fec7687940f4212ac05d460ab2ab5..6f151c185850738a9f8a575f9c09e3c469f5f9e2 100644
|
||||
--- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
+++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
@@ -13,6 +13,7 @@ public class ProtocolSupport extends ConfigModules {
|
||||
@@ -16,15 +16,15 @@ index c159340c3d7d90601bb69a4e1b997e372d48841a..81caf114feeb7b94e984e025b7922cc2
|
||||
+ public static boolean chatImageProtocol = false;
|
||||
public static boolean xaeroMapProtocol = false;
|
||||
public static int xaeroMapServerID = new Random().nextInt();
|
||||
|
||||
@@ -20,6 +21,7 @@ public class ProtocolSupport extends ConfigModules {
|
||||
public static boolean syncmaticaProtocol = false;
|
||||
@@ -23,6 +24,7 @@ public class ProtocolSupport extends ConfigModules {
|
||||
public void onLoaded() {
|
||||
jadeProtocol = config.getBoolean(getBasePath() + ".jade-protocol", jadeProtocol);
|
||||
appleskinProtocol = config.getBoolean(getBasePath() + ".appleskin-protocol", appleskinProtocol);
|
||||
+ chatImageProtocol = config.getBoolean(getBasePath() + ".chatimage-protocol", chatImageProtocol);
|
||||
xaeroMapProtocol = config.getBoolean(getBasePath() + ".xaero-map-protocol", xaeroMapProtocol);
|
||||
xaeroMapServerID = config.getInt(getBasePath() + ".xaero-map-server-id", xaeroMapServerID);
|
||||
}
|
||||
syncmaticaProtocol = config.getBoolean(getBasePath() + ".syncmatica-protocol", syncmaticaProtocol);
|
||||
diff --git a/src/main/java/org/leavesmc/leaves/protocol/ChatImageProtocol.java b/src/main/java/org/leavesmc/leaves/protocol/ChatImageProtocol.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..87ffe8a81a8bab7d20ff9551b105487d47616ee1
|
||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Asteor Bar protocol
|
||||
This patch is Powered by AsteorBar (https://github.com/afoxxvi/AsteorBarMod)
|
||||
|
||||
diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
index 81caf114feeb7b94e984e025b7922cc212da817e..1ae8d17c20c1ce661139e4caf348592caef3d81e 100644
|
||||
index 6f151c185850738a9f8a575f9c09e3c469f5f9e2..1d8d321ac3f6c8bf12afe22d8b3f37655fa8c46c 100644
|
||||
--- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
+++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
@@ -13,6 +13,7 @@ public class ProtocolSupport extends ConfigModules {
|
||||
@@ -17,7 +17,7 @@ index 81caf114feeb7b94e984e025b7922cc212da817e..1ae8d17c20c1ce661139e4caf348592c
|
||||
public static boolean chatImageProtocol = false;
|
||||
public static boolean xaeroMapProtocol = false;
|
||||
public static int xaeroMapServerID = new Random().nextInt();
|
||||
@@ -21,6 +22,7 @@ public class ProtocolSupport extends ConfigModules {
|
||||
@@ -24,6 +25,7 @@ public class ProtocolSupport extends ConfigModules {
|
||||
public void onLoaded() {
|
||||
jadeProtocol = config.getBoolean(getBasePath() + ".jade-protocol", jadeProtocol);
|
||||
appleskinProtocol = config.getBoolean(getBasePath() + ".appleskin-protocol", appleskinProtocol);
|
||||
@@ -9,10 +9,10 @@ Original project: https://github.com/LeavesMC/Leaves
|
||||
Commit: e234432bd99e1c4b07c24d1dd247977226a7516a
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index aba0cf1504f0439514183af9b46c59008d47a0e8..e099fb784d4bc0b5820778c1bbc899d718739093 100644
|
||||
index f0105e01f94352dee85f91ca2ae951311f4c052f..c9cf3499de2809c9983881c88029b39264030f94 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -590,7 +590,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -593,7 +593,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
}
|
||||
// Paper end - Prevent moving into unloaded chunks
|
||||
|
||||
@@ -21,7 +21,7 @@ index aba0cf1504f0439514183af9b46c59008d47a0e8..e099fb784d4bc0b5820778c1bbc899d7
|
||||
// CraftBukkit end
|
||||
ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", new Object[]{entity.getName().getString(), this.player.getName().getString(), d6, d7, d8});
|
||||
this.send(new ClientboundMoveVehiclePacket(entity));
|
||||
@@ -625,7 +625,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -628,7 +628,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
d10 = d6 * d6 + d7 * d7 + d8 * d8;
|
||||
boolean flag2 = false;
|
||||
|
||||
@@ -30,7 +30,7 @@ index aba0cf1504f0439514183af9b46c59008d47a0e8..e099fb784d4bc0b5820778c1bbc899d7
|
||||
flag2 = true;
|
||||
ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)});
|
||||
}
|
||||
@@ -1448,7 +1448,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -1451,7 +1451,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
|
||||
toX, toY, toZ, toYaw, toPitch, true);
|
||||
if (!event.isAllowed()) {
|
||||
@@ -39,7 +39,7 @@ index aba0cf1504f0439514183af9b46c59008d47a0e8..e099fb784d4bc0b5820778c1bbc899d7
|
||||
ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8});
|
||||
this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
|
||||
return;
|
||||
@@ -1517,7 +1517,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -1520,7 +1520,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
d10 = d6 * d6 + d7 * d7 + d8 * d8;
|
||||
boolean movedWrongly = false; // Paper - Add fail move event; rename
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Faster Random for xaeroMapServerID generation
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
index 1ae8d17c20c1ce661139e4caf348592caef3d81e..46ba1542dad0259f8b823a9dbc99190e2385eb31 100644
|
||||
index 1d8d321ac3f6c8bf12afe22d8b3f37655fa8c46c..62fc12c13b8294dab45da4e250bf2e7680744c83 100644
|
||||
--- a/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
+++ b/src/main/java/org/dreeam/leaf/config/modules/network/ProtocolSupport.java
|
||||
@@ -3,7 +3,7 @@ package org.dreeam.leaf.config.modules.network;
|
||||
@@ -23,6 +23,6 @@ index 1ae8d17c20c1ce661139e4caf348592caef3d81e..46ba1542dad0259f8b823a9dbc99190e
|
||||
public static boolean xaeroMapProtocol = false;
|
||||
- public static int xaeroMapServerID = new Random().nextInt();
|
||||
+ public static int xaeroMapServerID = ThreadLocalRandom.current().nextInt(); // Leaf - Faster Random
|
||||
|
||||
@Override
|
||||
public void onLoaded() {
|
||||
public static boolean syncmaticaProtocol = false;
|
||||
public static boolean syncmaticaQuota = false;
|
||||
public static int syncmaticaQuotaLimit = 40000000;
|
||||
@@ -15,7 +15,7 @@ This patch was ported downstream from the Petal fork.
|
||||
Makes most pathfinding-related work happen asynchronously
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
index 26a2dbc431146828a79c34543bdabca877b6fa42..37a7fdb543cb39d67716bdbca306d7006cf267bb 100644
|
||||
index f43774ddcc6071ee2f61c57ac1a4596936194218..2002aef0b01de0b6f10478a9dd08778243bceb3d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
@@ -297,6 +297,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
||||
@@ -75,7 +75,7 @@ index c03608fec96b51e1867f43d8f42e5aefb1520e46..15b21fa3907db1b77ed5b5d1050a37f4
|
||||
throw new IllegalStateException("Ticking retired scheduler");
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 59983594f1128b82230d8e8572438f2be8002966..17c2ef53ce8a2fb0d8a2aba63082f23f6c8504ee 100644
|
||||
index c5fa13527dc1729f7cbb15067b4edf449c2f6fb1..dd5ef3b8059d38f2e5f4acc2c49607f71c1ce1e5 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -16,7 +16,7 @@ This seems stupid, but it does seem that it improves the performance a bit, and
|
||||
We also create a "canSee" method tailored for "ChunkMap#updatePlayer()", a method without the equals check (the "updatePlayer()" already checks if the entity is the same entity) because the CraftPlayer's `equals()` check is a *bit* expensive compared to only checking the object's identity, and because the identity has already been check, we don't need to check it twice.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||||
index d31a2c3f1ff62f60a058148760fb6dbf92e46a76..282f2ed157e514207c8b41a7fb355d3dba0917dd 100644
|
||||
index 10479df72c815e235f5eef9eeae3bdd32f1ef665..1a075df1eff98970acc389aadd472b5214d3364a 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||||
@@ -1246,7 +1246,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||||
@@ -53,10 +53,10 @@ index d954c8e0cefe7337059bda5d5c1429a445a633d0..2f4096cb2bf93f880d01283df8d10bf9
|
||||
} else {
|
||||
getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix, true);
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index e099fb784d4bc0b5820778c1bbc899d718739093..7d691af2d3e1baa046dd3ab2ba70f8cf7bbd3c21 100644
|
||||
index c9cf3499de2809c9983881c88029b39264030f94..d700c5d6faae6d5229e311a9918fd0c2d231c448 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2203,8 +2203,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -2206,8 +2206,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Block log4j rce exploit in chat
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 7d691af2d3e1baa046dd3ab2ba70f8cf7bbd3c21..4ea341d586fae146659338f4cf70ee0508519f92 100644
|
||||
index d700c5d6faae6d5229e311a9918fd0c2d231c448..abf2605cd11f36584976b576366c92c71b3e00e2 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2387,6 +2387,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -2390,6 +2390,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
}
|
||||
|
||||
private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit
|
||||
@@ -17,7 +17,7 @@ index 7d691af2d3e1baa046dd3ab2ba70f8cf7bbd3c21..4ea341d586fae146659338f4cf70ee05
|
||||
if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) {
|
||||
this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
|
||||
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
|
||||
@@ -2418,6 +2420,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -2421,6 +2423,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Ignore terminal provider warning
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index d26f85511bb091a54d2059ef8f59f5df3093ccde..29a26b45f2dea70a3b72f08d88882c62b47e3382 100644
|
||||
index 68eb9935f09ad38157d50c07c1539d51138e2f3d..b5bf415a61bcc3b605ec776be99b4e184c0f4210 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -324,6 +324,9 @@ public class Main {
|
||||
@@ -7,7 +7,7 @@ Revert to old console provider, Fix https://github.com/PaperMC/Paper/issues/1040
|
||||
Solution refers to https://inside.java/2023/07/31/quality-heads-up
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 29a26b45f2dea70a3b72f08d88882c62b47e3382..c3c5cfbfd2d1f25d98d8dc0cca31fdc47d2af0bb 100644
|
||||
index b5bf415a61bcc3b605ec776be99b4e184c0f4210..0b8e68ad835e404e971ef5d15790053c89c88149 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -326,6 +326,7 @@ public class Main {
|
||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix console output display on Pterodactyl panel
|
||||
Fixed console display issue when the terminal used xterm, should work on Pterodactyl, MCSManager and kind of panel software
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index c3c5cfbfd2d1f25d98d8dc0cca31fdc47d2af0bb..a0d67bab9f5efe137009b5d82e09a01f24a8e0a0 100644
|
||||
index 0b8e68ad835e404e971ef5d15790053c89c88149..559dbad09d8e1ef45de31617167c546493a93630 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -328,6 +328,14 @@ public class Main {
|
||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix-MC-183518
|
||||
Related MC issue: https://bugs.mojang.com/browse/MC-183518
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
||||
index 43487a9ee202c5b0e5a416519939111f77b3059c..e60d98d1531bc6c962b7cbc3595daa5efa3aed93 100644
|
||||
index f22fb84c7e7929d6c80c44b13179cf385d8a43f9..36ee0c16f5958204276057cbe582e8cb35a5296e 100644
|
||||
--- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
||||
+++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
||||
@@ -142,8 +142,9 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
|
||||
@@ -6,10 +6,10 @@ Subject: [PATCH] Use caffeine cache kickPermission instead of using
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 4ea341d586fae146659338f4cf70ee0508519f92..9ec894322732d7ed9e61e797f6fd7007d3a54a53 100644
|
||||
index abf2605cd11f36584976b576366c92c71b3e00e2..c41987b5995e27c9b1f8bb2e8af341315c6f338c 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -338,17 +338,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -339,17 +339,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
// CraftBukkit end
|
||||
|
||||
// Purpur start
|
||||
@@ -30,8 +30,8 @@ index 4ea341d586fae146659338f4cf70ee0508519f92..9ec894322732d7ed9e61e797f6fd7007
|
||||
+ // Leaf - Use caffeine cache kickPermission instead of using google.common.cache
|
||||
// Purpur end
|
||||
|
||||
@Override
|
||||
@@ -420,7 +415,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
public final org.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget exchangeTarget; // Leaves - Syncmatica Protocol
|
||||
@@ -423,7 +418,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits
|
||||
// Purpur start
|
||||
this.player.setAfk(true);
|
||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Do not place player if the server is full
|
||||
Fix https://github.com/PaperMC/Paper/issues/10668
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
index e7d5610de6bda486e512f18bf0684686ed9c08df..7b22402d2b0ed0a17d6b8e01e7ed882033cadcf3 100644
|
||||
index eaf81d2fdebae94c3ba5eead84a3ebf1c09fa7ad..dca6ca722c2ce8ab320c2e36eb12fa75b78758ec 100644
|
||||
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||
@@ -78,6 +78,7 @@ import net.minecraft.server.level.ClientInformation;
|
||||
@@ -574,3 +574,48 @@ index 43ad624bbe334384de4e79d0075e67389648c014..a03a6e558179a1b1c81ee57143e00cd0
|
||||
|
||||
private static final ResourceLocation PACKET_SERVER_PING = JadeProtocol.id("server_ping_v1");
|
||||
private static final StreamCodec<RegistryFriendlyByteBuf, List<Block>> SHEARABLE_BLOCKS_CODEC = ByteBufCodecs.registry(Registries.BLOCK).apply(ByteBufCodecs.list());
|
||||
diff --git a/src/main/java/org/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java b/src/main/java/org/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java
|
||||
index 3f06c2006877bd35dedca02ffba9e30b0391e022..91e88f0325e48f8c2523028acbacf04e22262c67 100644
|
||||
--- a/src/main/java/org/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java
|
||||
+++ b/src/main/java/org/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java
|
||||
@@ -48,6 +48,10 @@ public class CommunicationManager {
|
||||
public CommunicationManager() {
|
||||
}
|
||||
|
||||
+ public static boolean shouldEnable() {
|
||||
+ return org.dreeam.leaf.config.modules.network.ProtocolSupport.syncmaticaProtocol;
|
||||
+ }
|
||||
+
|
||||
public static GameProfile getGameProfile(final ExchangeTarget exchangeTarget) {
|
||||
return playerMap.get(exchangeTarget).getGameProfile();
|
||||
}
|
||||
@@ -66,9 +70,6 @@ public class CommunicationManager {
|
||||
|
||||
@ProtocolHandler.PlayerJoin
|
||||
public static void onPlayerJoin(ServerPlayer player) {
|
||||
- if (!org.dreeam.leaf.config.modules.network.ProtocolSupport.syncmaticaProtocol) {
|
||||
- return;
|
||||
- }
|
||||
final ExchangeTarget newPlayer = player.connection.exchangeTarget;
|
||||
final VersionHandshakeServer hi = new VersionHandshakeServer(newPlayer);
|
||||
playerMap.put(newPlayer, player);
|
||||
@@ -79,9 +80,6 @@ public class CommunicationManager {
|
||||
|
||||
@ProtocolHandler.PlayerLeave
|
||||
public static void onPlayerLeave(ServerPlayer player) {
|
||||
- if (!org.dreeam.leaf.config.modules.network.ProtocolSupport.syncmaticaProtocol) {
|
||||
- return;
|
||||
- }
|
||||
final ExchangeTarget oldPlayer = player.connection.exchangeTarget;
|
||||
final Collection<Exchange> potentialMessageTarget = oldPlayer.getExchanges();
|
||||
if (potentialMessageTarget != null) {
|
||||
@@ -96,9 +94,6 @@ public class CommunicationManager {
|
||||
|
||||
@ProtocolHandler.PayloadReceiver(payload = LeavesProtocolManager.LeavesPayload.class, ignoreId = true)
|
||||
public static void onPacketGet(ServerPlayer player, LeavesProtocolManager.LeavesPayload payload) {
|
||||
- if (!org.dreeam.leaf.config.modules.network.ProtocolSupport.syncmaticaProtocol) {
|
||||
- return;
|
||||
- }
|
||||
onPacket(player.connection.exchangeTarget, payload.id(), payload.data());
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ Remove stream and remove double Mth.floor() convert
|
||||
before 1700ms, after 370ms, in massive stacked minecart test
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index b907a7231cbed1c7b95b0b57ee0ac68843e5b412..d395f402c2bcec0b7a9699aa0177f95230e420b3 100644
|
||||
index a8064df7eeec655aca406739a16c4133e0755bd8..8d9fc30f090efc7509f4e2b74b0d6c30627effbd 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -1337,9 +1337,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
Reference in New Issue
Block a user