SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
paper-server/nms-patches/TickListServer.patch
View File

@@ -1,9 +1,9 @@
--- a/net/minecraft/server/TickListServer.java
+++ b/net/minecraft/server/TickListServer.java
@@ -11,14 +11,15 @@
import java.util.function.Consumer;
@@ -12,14 +12,15 @@
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Stream;
+import org.bukkit.craftbukkit.util.HashTreeSet; // CraftBukkit
public class TickListServer<T> implements TickList<T> {
@@ -18,7 +18,7 @@
private final WorldServer f;
private final List<NextTickListEntry<T>> g = Lists.newArrayList();
private final Consumer<NextTickListEntry<T>> h;
@@ -34,16 +35,22 @@
@@ -35,16 +36,22 @@
public void a() {
int i = this.nextTickList.size();
@@ -37,14 +37,14 @@
+ // CraftBukkit end
}
this.f.methodProfiler.enter("cleaning");
this.f.getMethodProfiler().enter("cleaning");
- NextTickListEntry nextticklistentry;
+ NextTickListEntry<T> nextticklistentry; // CraftBukkit - decompile error
for (int j = 0; j < i; ++j) {
nextticklistentry = (NextTickListEntry) this.nextTickList.first();
@@ -52,7 +59,7 @@
@@ -53,7 +60,7 @@
}
this.nextTickList.remove(nextticklistentry);
@@ -53,7 +53,7 @@
this.g.add(nextticklistentry);
}
@@ -118,7 +125,7 @@
@@ -122,7 +129,7 @@
if (blockposition.getX() >= structureboundingbox.a && blockposition.getX() < structureboundingbox.d && blockposition.getZ() >= structureboundingbox.c && blockposition.getZ() < structureboundingbox.f) {
if (flag) {
if (i == 0) {
@@ -62,19 +62,19 @@
}
iterator.remove();
@@ -187,7 +194,7 @@
}
@@ -196,7 +203,7 @@
@Override
public boolean a(BlockPosition blockposition, T t0) {
- return this.nextTickListHash.contains(new NextTickListEntry<>(blockposition, t0));
+ return this.nextTickList.contains(new NextTickListEntry<>(blockposition, t0)); // CraftBukkit
}
public void a(BlockPosition blockposition, T t0, int i, TickListPriority ticklistpriority) {
@@ -209,8 +216,8 @@
private void c(BlockPosition blockposition, T t0, int i, TickListPriority ticklistpriority) {
NextTickListEntry<T> nextticklistentry = new NextTickListEntry<>(blockposition, t0, (long) i + this.f.getTime(), ticklistpriority);
@Override
@@ -220,8 +227,8 @@
}
private void a(NextTickListEntry<T> nextticklistentry) {
- if (!this.nextTickListHash.contains(nextticklistentry)) {
- this.nextTickListHash.add(nextticklistentry);
+ // CraftBukkit - use nextTickList