Skip to content

Commit ee6983a

Browse files
Dreeam-qwqDreeam-qwq
committed
Build it
1 parent cb54a09 commit ee6983a

File tree

3 files changed

+163
-0
lines changed

3 files changed

+163
-0
lines changed

‎patches/unapplied/server/0029-Dont-send-useless-entity-packets.patch

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: William Blake Galbreath <blake.galbreath@gmail.com>
3+
Date: Sat, 6 Jul 2019 17:00:04 -0500
4+
Subject: [PATCH] Dont send useless entity packets
5+
6+
Original code by PurpurMC, licensed under MIT
7+
You can find the original code on https://github.com/PurpurMC/Purpur
8+
9+
diff --git a/src/main/java/dev/etil/mirai/MiraiConfig.java b/src/main/java/dev/etil/mirai/MiraiConfig.java
10+
index 8717e40515dbc7cfbb5b45ce706f5c720596b5fc..d867baee944627e1a1419611fac2d3385350b182 100644
11+
--- a/src/main/java/dev/etil/mirai/MiraiConfig.java
12+
+++ b/src/main/java/dev/etil/mirai/MiraiConfig.java
13+
@@ -152,4 +152,10 @@ public class MiraiConfig {
14+
checkVehicleFlying = getBoolean("checks.vehicle-flight", true,
15+
"Whether or not vanilla anticheat should check for passengers flying.");
16+
}
17+
+
18+
+ public static boolean dontSendUselessEntityPackets;
19+
+ private static void uselessEntityPackets() {
20+
+ dontSendUselessEntityPackets = getBoolean("dont-send-useless-entity-packets", true,
21+
+ "Whether or not server should send entity packets with null movements.");
22+
+ }
23+
}
24+
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
25+
index da459fa2bd8ad4b05a0ae99552db2709a5169c2a..b99eeae741c1042ae5d925957a87481c113f9502 100644
26+
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
27+
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
28+
@@ -206,6 +206,7 @@ public class ServerEntity {
29+
flag4 = true;
30+
flag5 = true;
31+
}
32+
+ if (dev.etil.mirai.MiraiConfig.dontSendUselessEntityPackets && isUselessPacket(packet1)) packet1 = null; // Purpur
33+
}
34+
35+
if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
36+
@@ -278,6 +279,21 @@ public class ServerEntity {
37+
});
38+
}
39+
40+
+ // Purpur start
41+
+ private boolean isUselessPacket(Packet<?> possibleUselessPacket) {
42+
+ if (possibleUselessPacket instanceof ClientboundMoveEntityPacket packet) {
43+
+ if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.Pos) {
44+
+ return packet.getXa() == 0 && packet.getYa() == 0 && packet.getZa() == 0;
45+
+ } else if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.PosRot) {
46+
+ return packet.getXa() == 0 && packet.getYa() == 0 && packet.getZa() == 0 && packet.getyRot() == 0 && packet.getxRot() == 0;
47+
+ } else if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.Rot) {
48+
+ return packet.getyRot() == 0 && packet.getxRot() == 0;
49+
+ }
50+
+ }
51+
+ return false;
52+
+ }
53+
+ // Purpur end
54+
+
55+
public void removePairing(ServerPlayer player) {
56+
this.entity.stopSeenByPlayer(player);
57+
player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));

‎patches/unapplied/server/0051-Fix-MC-26678.patch

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
3+
Date: Sat, 20 Jul 2024 05:28:12 +0800
4+
Subject: [PATCH] Fix MC-26678
5+
6+
Original license: MIT
7+
Original project: https://github.com/545u/OldDamageTilt
8+
9+
Mojang issues: https://bugs.mojang.com/browse/MC-172047
10+
11+
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
12+
index 152d0219c4da3a68e331771c336d8c9423081557..52627656dd506aa9fbc7b8070d6e4bdf4b033ba6 100644
13+
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
14+
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
15+
@@ -2482,7 +2482,9 @@ public abstract class Player extends LivingEntity {
16+
17+
@Override
18+
public float getHurtDir() {
19+
- return this.hurtDir;
20+
+ return org.dreeam.leaf.config.modules.fixes.FixMC26678.enabled
21+
+ ? this.hurtDir
22+
+ : 0.0F;
23+
}
24+
25+
@Override
26+
diff --git a/src/main/java/org/dreeam/leaf/config/modules/fixes/FixMC26678.java b/src/main/java/org/dreeam/leaf/config/modules/fixes/FixMC26678.java
27+
new file mode 100644
28+
index 0000000000000000000000000000000000000000..cdf992d47afd524b6b36f6befddeefe2cdf66265
29+
--- /dev/null
30+
+++ b/src/main/java/org/dreeam/leaf/config/modules/fixes/FixMC26678.java
31+
@@ -0,0 +1,21 @@
32+
+package org.dreeam.leaf.config.modules.fixes;
33+
+
34+
+import org.dreeam.leaf.config.ConfigInfo;
35+
+import org.dreeam.leaf.config.EnumConfigCategory;
36+
+import org.dreeam.leaf.config.IConfigModule;
37+
+
38+
+public class FixMC26678 implements IConfigModule {
39+
+
40+
+ @Override
41+
+ public EnumConfigCategory getCategory() {
42+
+ return EnumConfigCategory.FIXES;
43+
+ }
44+
+
45+
+ @Override
46+
+ public String getBaseName() {
47+
+ return "fix_MC_26678";
48+
+ }
49+
+
50+
+ @ConfigInfo(baseName = "enabled", comments = "Disable it to makes damage tilt toward left, to use old damage tilt")
51+
+ public static boolean enabled = true;
52+
+}

‎patches/unapplied/server/0094-Fix-Nova-compatibility.patch

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
3+
Date: Thu, 4 Jul 2024 19:47:01 +0800
4+
Subject: [PATCH] Fix Nova compatibility
5+
6+
By setting server brand to Purpur to be compatible with Nova plugin
7+
8+
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
9+
index 15c3d62262a589844dbaa8ac357402aa592cd351..5823a3fa71850b38cb00b869e597c2fabc8d4117 100644
10+
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
11+
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
12+
@@ -671,6 +671,12 @@ public final class CraftServer implements Server {
13+
14+
@Override
15+
public String getVersion() {
16+
+ // Leaf start - Fix Nova compatibility
17+
+ if (org.dreeam.leaf.config.modules.misc.FixNovaCompatibility.enabled) {
18+
+ return "git-Purpur-\"0000000\" (MC: " + this.console.getServerVersion() + ")";
19+
+ }
20+
+ // Leaf end - Fix Nova compatibility
21+
+
22+
return this.serverVersion + " (MC: " + this.console.getServerVersion() + ")";
23+
}
24+
25+
diff --git a/src/main/java/org/dreeam/leaf/config/modules/misc/FixNovaCompatibility.java b/src/main/java/org/dreeam/leaf/config/modules/misc/FixNovaCompatibility.java
26+
new file mode 100644
27+
index 0000000000000000000000000000000000000000..fb13c33172b530c080a6028241bb6f5efd91cdaf
28+
--- /dev/null
29+
+++ b/src/main/java/org/dreeam/leaf/config/modules/misc/FixNovaCompatibility.java
30+
@@ -0,0 +1,24 @@
31+
+package org.dreeam.leaf.config.modules.misc;
32+
+
33+
+import org.dreeam.leaf.config.ConfigInfo;
34+
+import org.dreeam.leaf.config.EnumConfigCategory;
35+
+import org.dreeam.leaf.config.IConfigModule;
36+
+
37+
+public class FixNovaCompatibility implements IConfigModule {
38+
+
39+
+ @Override
40+
+ public EnumConfigCategory getCategory() {
41+
+ return EnumConfigCategory.MISC;
42+
+ }
43+
+
44+
+ @Override
45+
+ public String getBaseName() {
46+
+ return "fix_nova_compatibility";
47+
+ }
48+
+
49+
+ @ConfigInfo(baseName = "enabled", comments = """
50+
+ Set the server brand to Purpur if enabled.
51+
+ Don't enable this unless you have to use Nova
52+
+ """)
53+
+ public static boolean enabled = false;
54+
+}

0 commit comments

Comments
 (0)