Skip to content
This repository was archived by the owner on Dec 29, 2023. It is now read-only.

Commit fffc69c

Browse files
committed
Remove some patches (which weren't tested well or without much performance gain)
- [WindSpigot-0001] Thread affinity by windcolor-dev - [IonSpigot-0011] Async Spawn Chunks by SuicidalKids - [MineTick-0017] Fix insane nether portal lag - [Tuinity-????] Skip updating entity tracker without players - [Akarin-0010] Save Json list asynchronously - [Nacho-0019] Avoid lock every packet send Maybe in future some of them will be brought back again
1 parent 7a24fd1 commit fffc69c

File tree

221 files changed

+771
-1686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+771
-1686
lines changed

README.md

+1-10
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ Titanium implements patches from other engines as well. **All credits go to the
142142
[Nacho-0009] Remove an extra file io call within world credit bob7l
143143
[Nacho-0010] Use jchambers' FAST UUID methods
144144
[Nacho-0012] Don't load chunks for physics
145-
[Nacho-0019] Avoid lock every packet send
146145
[Nacho-0023] Optimize EntityTracker for the chunk updater
147146
[Nacho-0024] Do not create new BlockPosition when loading chunk
148147
[Nacho-0025] Disable random tickSpeed being modified
@@ -152,12 +151,9 @@ Titanium implements patches from other engines as well. **All credits go to the
152151
[Nacho-????] Async Entity Tracker by Rastrian
153152
[Nacho-????] Async knockback and hit detection packets by Rastrian
154153
155-
[WindSpigot-0001] Thread affinity by windcolor-dev
156154
[WindSpigot-0014] Async entity path searching by windcolor-dev
157155
[WindSpigot-0017] Async entity tracking by windcolor-dev
158156
[WindSpigot-0054] Modern tick loop by windcolor-dev
159-
[WindSpigot-????] Use concurrent entity tracking collections by windcolor-dev
160-
[WindSpigot-????] Prevent display of overload on first 500 ticks by windcolor-dev
161157
162158
[PandaSpigot-0003/0004] Setup Gradle project by hpfxd
163159
[PandaSpigot-0005] Add internal setMaxStackSize method for materials by hpfxd
@@ -193,11 +189,10 @@ Titanium implements patches from other engines as well. **All credits go to the
193189
[IonSpigot-0006] Fix Chunk Loading by SuicidalKids
194190
[IonSpigot-0008] Reduce Chunk Hashing by SuicidalKids
195191
[IonSpigot-0009] Reduce Unload Queue Complexity by SuicidalKids
196-
[IonSpigot-0011] Async Spawn Chunks by SuicidalKids
197192
[IonSpigot-0012] Movement Cache by SuicidalKids
193+
[IonSpigot-0013] Implement PandaWire by SuicidalKids
198194
[IonSpigot-0014] Faster Chunk Entity List by SuicidalKids
199195
[IonSpigot-0020] Faster EntityTracker Collections by SuicidalKids
200-
[IonSpigot-0023] Implement PandaWire by SuicidalKids
201196
[IonSpigot-0037] Fast Cannon Entity Tracker by SuicidalKids
202197
203198
[Migot-0005] Fix Occasional Client Side Unloading of Chunk 0 0
@@ -207,7 +202,6 @@ Titanium implements patches from other engines as well. **All credits go to the
207202
[Migot-0036] Check for lava only once per tick
208203
209204
[MineTick-0011] Optimize Idle Furnaces
210-
[MineTick-0017] Fix insane nether portal lag
211205
[MineTick-0023] Fix chunk coordinates miscalculations
212206
213207
[KigPaper-0108] Fix CraftPlayer setFlying not working by RoccoDev
@@ -218,8 +212,6 @@ Titanium implements patches from other engines as well. **All credits go to the
218212
[KigPaper-0170] Kick after receiving invalid creative action packet by RoccoDev
219213
[KigPaper-0070/0233] Prevent billion laughs attacks
220214
221-
[Tuinity-????] Skip updating entity tracker without players
222-
223215
[Purpur-0150] Tick fluids config
224216
[Purpur-0046/0280] Spark Profiler by BillyGalbreath
225217
[Purpur-0049/0290] Remove Timings by BillyGalbreath
@@ -229,7 +221,6 @@ Titanium implements patches from other engines as well. **All credits go to the
229221
[Yatopia-0047] Smarter statistics ticking
230222
231223
[Akarin-0007] Avoid double I/O operation on load player file
232-
[Akarin-0010] Save Json list asynchronously
233224
234225
[InsanePaper-269] Cache Chunk Coordinations
235226

patches/server/0003-Implement-MineTick-0017-Fix-insane-nether-portal-lag.patch

-48
This file was deleted.

patches/server/0004-Implement-MineTick-0023-Fix-chunk-coordinates-miscal.patch renamed to patches/server/0003-Implement-MineTick-0023-Fix-chunk-coordinates-miscal.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 9e20760e31e2c68e1ac859adacc09e307d2fdeae Mon Sep 17 00:00:00 2001
1+
From 6edbdc2464a7a11711407c4d0f281b9e80ea9874 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Fri, 9 Apr 2021 14:11:53 +0200
44
Subject: [PATCH] Implement [MineTick-0023] Fix chunk coordinates

patches/server/0005-Implement-Paper-0347-Don-t-go-below-0-for-pickupDela.patch renamed to patches/server/0004-Implement-Paper-0347-Don-t-go-below-0-for-pickupDela.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5a8164bf55a5d25fc83289bdef7856cda9e4ba1e Mon Sep 17 00:00:00 2001
1+
From 9be1fb0169a0e4c2cf92e47ee2094e50bae92374 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Fri, 9 Apr 2021 15:49:05 +0200
44
Subject: [PATCH] Implement [Paper-0347] Don't go below 0 for pickupDelay,

patches/server/0006-Implement-Akarin-0007-Avoid-double-I-O-operation-on-.patch renamed to patches/server/0005-Implement-Akarin-0007-Avoid-double-I-O-operation-on-.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 9b7294b1008b014430fe33f917b1102c87cdc5e4 Mon Sep 17 00:00:00 2001
1+
From 6724ec61b53334d71256f80bb0e20157f4331bc9 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Fri, 9 Apr 2021 14:41:18 +0200
44
Subject: [PATCH] Implement [Akarin-0007] Avoid double I/O operation on load

patches/server/0007-Implement-Paper-0144-Improve-Minecraft-Hopper-Perfor.patch renamed to patches/server/0006-Implement-Paper-0144-Improve-Minecraft-Hopper-Perfor.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From d912c32f7d97df1214b4612b6f1712735acd6ce3 Mon Sep 17 00:00:00 2001
1+
From 1c8aae509813c7296397b0f31d38e6a870d52c3a Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Fri, 9 Apr 2021 15:10:40 +0200
44
Subject: [PATCH] Implement [Paper-0144] Improve Minecraft Hopper Performance
55

66

77
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
8-
index f68b132f..dd9efeba 100644
8+
index f68b132fb..dd9efebad 100644
99
--- a/src/main/java/net/minecraft/server/TileEntity.java
1010
+++ b/src/main/java/net/minecraft/server/TileEntity.java
1111
@@ -22,6 +22,7 @@ public abstract class TileEntity {
@@ -25,7 +25,7 @@ index f68b132f..dd9efeba 100644
2525

2626
this.h = iblockdata.getBlock().toLegacyData(iblockdata);
2727
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
28-
index 760a0767..49a004b2 100644
28+
index 760a0767e..49a004b20 100644
2929
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
3030
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
3131
@@ -504,7 +504,9 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU

patches/server/0008-Implement-Paper-0313-Optimized-world-time-updates-by.patch renamed to patches/server/0007-Implement-Paper-0313-Optimized-world-time-updates-by.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 45f6e8c9ce0d2182480538b6c32e397ea0d0d766 Mon Sep 17 00:00:00 2001
1+
From 3e9f27b810f34512af7ad3cb6525cd703249fa38 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Fri, 9 Apr 2021 18:59:20 +0200
44
Subject: [PATCH] Implement [Paper-0313] Optimized world time updates by Aikar

patches/server/0009-Implement-Paper-0302-Don-t-load-chunks-for-villager-.patch renamed to patches/server/0008-Implement-Paper-0302-Don-t-load-chunks-for-villager-.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 9a6b08f8a69d2851de2d56d72a790fa1ab7a0506 Mon Sep 17 00:00:00 2001
1+
From 644cb7af95097aa1ed886bfb1b8ea1a769a19d26 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Fri, 9 Apr 2021 16:00:40 +0200
44
Subject: [PATCH] Implement [Paper-0302] Don't load chunks for villager door

patches/server/0010-Implement-Nacho-0012-Don-t-load-chunks-for-physics.patch renamed to patches/server/0009-Implement-Nacho-0012-Don-t-load-chunks-for-physics.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From 8423252a8db8b402c4a611c4a66f80553babc71d Mon Sep 17 00:00:00 2001
1+
From 10b396ba66903b60980c2f589465d38d39ba6343 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Fri, 9 Apr 2021 15:56:09 +0200
44
Subject: [PATCH] Implement [Nacho-0012] Don't load chunks for physics
55

66

77
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
8-
index b92a64ea..104e61e2 100644
8+
index b92a64eae..104e61e2b 100644
99
--- a/src/main/java/net/minecraft/server/World.java
1010
+++ b/src/main/java/net/minecraft/server/World.java
1111
@@ -573,7 +573,8 @@ public abstract class World implements IBlockAccess {

patches/server/0011-Cache-bukkit-version.patch renamed to patches/server/0010-Cache-bukkit-version.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From 8d3d01b771c45eb8c150803a19b49c8dc4fd7d8e Mon Sep 17 00:00:00 2001
1+
From 4bc1a8dc85047542d295254fd2114d538aa04aca Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Thu, 19 May 2022 08:00:35 +0200
44
Subject: [PATCH] Cache bukkit version
55

66

77
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
8-
index 3a4b1424..5aa56804 100644
8+
index 3a4b14246..5aa568046 100644
99
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
1010
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
1111
@@ -8,22 +8,27 @@ import java.util.logging.Logger;

patches/server/0012-Use-Object2ObjectOpenHashMap-to-Player-List.patch renamed to patches/server/0011-Use-Object2ObjectOpenHashMap-to-Player-List.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From 1f47314f1bd108694d51a21fc74003f45d5aae3d Mon Sep 17 00:00:00 2001
1+
From db265ba2f7763ed4e637743e59966f774f174fe3 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Wed, 27 Apr 2022 22:20:00 +0200
44
Subject: [PATCH] Use Object2ObjectOpenHashMap to Player List
55

66

77
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
8-
index bc8124b8..96a906f0 100644
8+
index bc8124b85..96a906f04 100644
99
--- a/src/main/java/net/minecraft/server/PlayerList.java
1010
+++ b/src/main/java/net/minecraft/server/PlayerList.java
1111
@@ -5,6 +5,7 @@ import com.google.common.collect.Maps;
@@ -26,7 +26,7 @@ index bc8124b8..96a906f0 100644
2626
private final IpBanList l;
2727
private final OpList operators;
2828
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
29-
index 69485fa6..32ad864a 100644
29+
index 69485fa69..32ad864ab 100644
3030
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
3131
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
3232
@@ -1,5 +1,6 @@

patches/server/0014-Implement-Paper-0346-MC-135506-Experience-should-sav.patch renamed to patches/server/0012-Implement-Paper-0346-MC-135506-Experience-should-sav.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
From 61fbad132c2a6e3fce39fa7b18a9ebd9aa2da355 Mon Sep 17 00:00:00 2001
1+
From 564187914bed271aa3a36c94af22e2621ed77d9c Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Sun, 1 May 2022 12:12:12 +0200
44
Subject: [PATCH] Implement [Paper-0346] [MC-135506] Experience should save as
55
Integers
66

77

88
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
9-
index aefa9fa8..58bb432f 100644
9+
index aefa9fa87..58bb432f5 100644
1010
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
1111
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
1212
@@ -145,13 +145,13 @@ public class EntityExperienceOrb extends Entity {

patches/server/0015-Implement-FlamePaper-0013-Check-channel-before-readi.patch renamed to patches/server/0013-Implement-FlamePaper-0013-Check-channel-before-readi.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From 7ad18028222b1a4ca1e316d0b1015263b307466c Mon Sep 17 00:00:00 2001
1+
From c0aff8994e3372b6cf9d7675f278f4197566c3b1 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Sun, 8 May 2022 23:08:43 +0200
44
Subject: [PATCH] Implement [FlamePaper-0013] Check channel before reading
55

66

77
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
8-
index 9d23c6c0..ba422aec 100644
8+
index 9d23c6c0c..ba422aecb 100644
99
--- a/src/main/java/net/minecraft/server/NetworkManager.java
1010
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
1111
@@ -322,7 +322,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {

patches/server/0013-Implement-IonSpigot-0011-Async-Spawn-Chunks.patch

-35
This file was deleted.

patches/server/0016-Implement-IonSpigot-0014-Faster-Chunk-Entity-List.patch renamed to patches/server/0014-Implement-IonSpigot-0014-Faster-Chunk-Entity-List.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
From d576ef27155d2b8d64a38d38b65fbfe712ad5d81 Mon Sep 17 00:00:00 2001
1+
From 971ef0dd054b8407beb0f61d72b8e41b58b2d05e Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Tue, 10 May 2022 20:25:51 +0200
44
Subject: [PATCH] Implement [IonSpigot-0014] Faster Chunk Entity List
55

66

77
diff --git a/src/main/java/io/papermc/paper/util/maplist/ObjectMapList.java b/src/main/java/io/papermc/paper/util/maplist/ObjectMapList.java
88
new file mode 100644
9-
index 00000000..8fc248c8
9+
index 000000000..8fc248c8b
1010
--- /dev/null
1111
+++ b/src/main/java/io/papermc/paper/util/maplist/ObjectMapList.java
1212
@@ -0,0 +1,200 @@
@@ -212,7 +212,7 @@ index 00000000..8fc248c8
212212
+}
213213
\ No newline at end of file
214214
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
215-
index ab0d41ca..7a0001d0 100644
215+
index ab0d41cad..7a0001d0d 100644
216216
--- a/src/main/java/net/minecraft/server/Chunk.java
217217
+++ b/src/main/java/net/minecraft/server/Chunk.java
218218
@@ -144,7 +144,7 @@ public class Chunk {

patches/server/0018-Implement-IonSpigot-0006-Fix-Chunk-Loading.patch renamed to patches/server/0015-Implement-IonSpigot-0006-Fix-Chunk-Loading.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From 474cb90f41e7aba473f1a268b4c7ed55655f7a66 Mon Sep 17 00:00:00 2001
1+
From 718069f24dedda5d56748ed799740bab33ecdca4 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Wed, 11 May 2022 16:04:30 +0200
44
Subject: [PATCH] Implement [IonSpigot-0006] Fix Chunk Loading
55

66

77
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
8-
index fd17fc63..3b03f651 100644
8+
index fd17fc63f..3b03f651a 100644
99
--- a/src/main/java/net/minecraft/server/Entity.java
1010
+++ b/src/main/java/net/minecraft/server/Entity.java
1111
@@ -422,11 +422,31 @@ public abstract class Entity implements ICommandListener {

patches/server/0019-Implement-Paper-0072-Fix-Furnace-cook-time-bug-when-.patch renamed to patches/server/0016-Implement-Paper-0072-Fix-Furnace-cook-time-bug-when-.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
From 20b0cf0a1d2ae5fb9d86a764e62a2126daf7a49b Mon Sep 17 00:00:00 2001
1+
From f9ff0c69da63a002db1c25616cb5527f234a60b2 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Wed, 11 May 2022 16:19:25 +0200
44
Subject: [PATCH] Implement [Paper-0072] Fix Furnace cook time bug when lagging
55
by Aikar
66

77

88
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
9-
index 0e3f35a6..a284b3cd 100644
9+
index 0e3f35a6e..a284b3cd2 100644
1010
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
1111
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
1212
@@ -100,7 +100,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IUpdatePla

patches/server/0020-Implement-MineTick-0011-Optimize-Idle-Furnaces.patch renamed to patches/server/0017-Implement-MineTick-0011-Optimize-Idle-Furnaces.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From 3852299b89c4e9362a6adc179bb2eabc07ffd915 Mon Sep 17 00:00:00 2001
1+
From b0fa2336db1250d8470db58b3e8a98402f09cc66 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Sun, 15 May 2022 17:39:58 +0200
44
Subject: [PATCH] Implement [MineTick-0011] Optimize Idle Furnaces
55

66

77
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
8-
index a284b3cd..41802611 100644
8+
index a284b3cd2..418026115 100644
99
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
1010
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
1111
@@ -206,7 +206,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IUpdatePla

patches/server/0017-Implement-Nacho-0019-Avoid-lock-every-packet-send.patch

-21
This file was deleted.

patches/server/0021-Implement-Spigot-0138-Branchless-NibbleArray-by-md5.patch renamed to patches/server/0018-Implement-Spigot-0138-Branchless-NibbleArray-by-md5.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
From d33338b0b35d774db04e1775e5b3e26adf7ed307 Mon Sep 17 00:00:00 2001
1+
From d862d2d80665d47d30b12249b3171d147122e387 Mon Sep 17 00:00:00 2001
22
From: Peridot <[email protected]>
33
Date: Sun, 15 May 2022 17:44:45 +0200
44
Subject: [PATCH] Implement [Spigot-0138] Branchless NibbleArray by md5
55

66

77
diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
8-
index 9306f97a..69e2f0a9 100644
8+
index 9306f97af..69e2f0a9d 100644
99
--- a/src/main/java/net/minecraft/server/NibbleArray.java
1010
+++ b/src/main/java/net/minecraft/server/NibbleArray.java
1111
@@ -30,17 +30,22 @@ public class NibbleArray {

0 commit comments

Comments
 (0)