Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
[CI-SKIP] Rebuild patches
Dieser Commit ist enthalten in:
Ursprung
26070a0e5c
Commit
4d991f1946
@ -1,4 +1,4 @@
|
||||
From 72eedab01e66ef317741baa2e60d627d34305ef3 Mon Sep 17 00:00:00 2001
|
||||
From cfd5fdb1c2d74d13459f23ff6cdf593cd1e293c9 Mon Sep 17 00:00:00 2001
|
||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||
Date: Fri, 14 Feb 2020 01:24:39 -0800
|
||||
Subject: [PATCH] Optimise TickListServer by rewriting it
|
||||
@ -37,7 +37,7 @@ to ticking, the items are re-scheduled.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
|
||||
new file mode 100644
|
||||
index 0000000000..666f49fe96
|
||||
index 000000000..666f49fe9
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
|
||||
@@ -0,0 +1,602 @@
|
||||
@ -645,7 +645,7 @@ index 0000000000..666f49fe96
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java b/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java
|
||||
new file mode 100644
|
||||
index 0000000000..13cf1a55a9
|
||||
index 000000000..13cf1a55a
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java
|
||||
@@ -0,0 +1,41 @@
|
||||
@ -692,7 +692,7 @@ index 0000000000..13cf1a55a9
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java b/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java
|
||||
new file mode 100644
|
||||
index 0000000000..118988c39e
|
||||
index 000000000..118988c39
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java
|
||||
@@ -0,0 +1,142 @@
|
||||
@ -839,7 +839,7 @@ index 0000000000..118988c39e
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||
index e650a2e48d..2d07d350d2 100644
|
||||
index e650a2e48..2d07d350d 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||
@@ -125,6 +125,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
|
||||
@ -851,7 +851,7 @@ index e650a2e48d..2d07d350d2 100644
|
||||
return this.b(baseblockposition.getX(), baseblockposition.getY(), baseblockposition.getZ());
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index cf9021d605..00a83aa7c6 100644
|
||||
index a385a473a..82168b6ae 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -119,6 +119,13 @@ public class ChunkProviderServer extends IChunkProvider {
|
||||
@ -869,7 +869,7 @@ index cf9021d605..00a83aa7c6 100644
|
||||
public ChunkProviderServer(WorldServer worldserver, File file, DataFixer datafixer, DefinedStructureManager definedstructuremanager, Executor executor, ChunkGenerator<?> chunkgenerator, int i, WorldLoadListener worldloadlistener, Supplier<WorldPersistentData> supplier) {
|
||||
this.world = worldserver;
|
||||
diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
|
||||
index 33cfeabdee..2287e47d1b 100644
|
||||
index 33cfeabde..2287e47d1 100644
|
||||
--- a/src/main/java/net/minecraft/server/NextTickListEntry.java
|
||||
+++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
|
||||
@@ -5,11 +5,13 @@ import java.util.Comparator;
|
||||
@ -940,7 +940,7 @@ index 33cfeabdee..2287e47d1b 100644
|
||||
public String toString() {
|
||||
return this.e + ": " + this.a + ", " + this.b + ", " + this.c + ", " + this.f;
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
index b38bc67758..9f8818c2d4 100644
|
||||
index b38bc6775..9f8818c2d 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
@@ -474,7 +474,9 @@ public class PlayerChunk {
|
||||
@ -955,7 +955,7 @@ index b38bc67758..9f8818c2d4 100644
|
||||
}
|
||||
});
|
||||
diff --git a/src/main/java/net/minecraft/server/StructureBoundingBox.java b/src/main/java/net/minecraft/server/StructureBoundingBox.java
|
||||
index dbb565e74d..185658e230 100644
|
||||
index dbb565e74..185658e23 100644
|
||||
--- a/src/main/java/net/minecraft/server/StructureBoundingBox.java
|
||||
+++ b/src/main/java/net/minecraft/server/StructureBoundingBox.java
|
||||
@@ -4,12 +4,12 @@ import com.google.common.base.MoreObjects;
|
||||
@ -994,7 +994,7 @@ index dbb565e74d..185658e230 100644
|
||||
return baseblockposition.getX() >= this.a && baseblockposition.getX() <= this.d && baseblockposition.getZ() >= this.c && baseblockposition.getZ() <= this.f && baseblockposition.getY() >= this.b && baseblockposition.getY() <= this.e;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
|
||||
index f533860bbe..3f1aa5ced6 100644
|
||||
index f533860bb..3f1aa5ced 100644
|
||||
--- a/src/main/java/net/minecraft/server/TickListServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/TickListServer.java
|
||||
@@ -42,6 +42,11 @@ public class TickListServer<T> implements TickList<T> {
|
||||
@ -1117,7 +1117,7 @@ index f533860bbe..3f1aa5ced6 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index c74b85917a..3e5ed2bd4e 100644
|
||||
index c74b85917..3e5ed2bd4 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -170,6 +170,13 @@ public class WorldServer extends World {
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren