apply fixup
I managed to move it, yet forgot to actually fix it up...
This commit is contained in:
Mariell Hoversholm
parent
c310f0a610
commit
9889c651ce
243 changed files with 15 additions and 25 deletions
|
|
@ -18,10 +18,18 @@ index 6e5d21af43261dc2f12ceec7b7e3269be635cf7a..ecf4cd6dfea777ab9daea0b40724d247
|
||||||
boolean flag1 = this.playerChunkMap.b();
|
boolean flag1 = this.playerChunkMap.b();
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||||||
index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..2ca9335129465ffb67617b42534db530c1d78923 100644
|
index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..36b4792687a5c6316bf95995e761bf4aa49779f6 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||||||
@@ -174,6 +174,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -31,6 +31,7 @@ import net.minecraft.core.NonNullList;
|
||||||
|
import net.minecraft.core.SectionPosition;
|
||||||
|
import net.minecraft.nbt.DynamicOpsNBT;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
+import net.minecraft.network.NetworkManager;
|
||||||
|
import net.minecraft.network.chat.ChatComponentText;
|
||||||
|
import net.minecraft.network.chat.ChatHoverable;
|
||||||
|
import net.minecraft.network.chat.ChatMessage;
|
||||||
|
@@ -174,6 +175,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
public PlayerConnection playerConnection;
|
public PlayerConnection playerConnection;
|
||||||
|
|
@ -29,7 +37,7 @@ index eaeac60b2d54d8e7d298ea412d888471a7ea9e79..2ca9335129465ffb67617b42534db530
|
||||||
public final MinecraftServer server;
|
public final MinecraftServer server;
|
||||||
public final PlayerInteractManager playerInteractManager;
|
public final PlayerInteractManager playerInteractManager;
|
||||||
public final Deque<Integer> removeQueue = new ArrayDeque<>(); // Paper
|
public final Deque<Integer> removeQueue = new ArrayDeque<>(); // Paper
|
||||||
@@ -240,6 +241,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -240,6 +242,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
public boolean joining = true;
|
public boolean joining = true;
|
||||||
public boolean sentListPacket = false;
|
public boolean sentListPacket = false;
|
||||||
public boolean supressTrackerForLogin = false; // Paper
|
public boolean supressTrackerForLogin = false; // Paper
|
||||||
|
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
||||||
Date: Tue, 16 Mar 2021 11:25:11 +0100
|
|
||||||
Subject: [PATCH] fixup! Load chunks asynchronously for players.
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
|
||||||
index 2ca9335129465ffb67617b42534db530c1d78923..36b4792687a5c6316bf95995e761bf4aa49779f6 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
|
||||||
@@ -31,6 +31,7 @@ import net.minecraft.core.NonNullList;
|
|
||||||
import net.minecraft.core.SectionPosition;
|
|
||||||
import net.minecraft.nbt.DynamicOpsNBT;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
+import net.minecraft.network.NetworkManager;
|
|
||||||
import net.minecraft.network.chat.ChatComponentText;
|
|
||||||
import net.minecraft.network.chat.ChatHoverable;
|
|
||||||
import net.minecraft.network.chat.ChatMessage;
|
|
||||||
|
|
@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
|
||||||
Set system properly at server startup if not set already to help protect from this.
|
Set system properly at server startup if not set already to help protect from this.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
index 2a36de929e6d433b0f67f0a901c03c624cd41e17..af1b93beee1cf4ea1be356eb47ef9a3c8d0f2837 100644
|
index 3348d0466e340acc8f143ec98a4b26f23939d8a7..23389d0a0e7bd8aeb2f1ab0ea6a149ef99e800fb 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||||
@@ -22,6 +22,7 @@ public class Main {
|
@@ -22,6 +22,7 @@ public class Main {
|
||||||
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index d6e313021d268c5d865394859b3d748edf1b061c..70c0fb4621b16c33d7cdf7d920c17bfe1ff8d831 100644
|
index 14e66414d043ce720b8fd7bfa2c476d8369c757b..25ec9c4f8c08551fd80a597a1b39854e70e4f895 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -142,6 +142,13 @@
|
@@ -142,6 +142,13 @@
|
||||||
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
|
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
|
||||||
index c0f5fdb832115c5a86005e4c3242d9fd7e52f82c..6a15a5f7d3e82f61c0f30bb6a339215376d4867d 100644
|
index 1732fc552c290d294b68d6f92f2a58d985fbef21..3dcbeec94d86f3b56eaf05676b176f60d711f9cd 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Main.java
|
--- a/src/main/java/net/minecraft/server/Main.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Main.java
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
||||||
@@ -132,11 +132,20 @@ public class Main {
|
@@ -132,11 +132,20 @@ public class Main {
|
||||||
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
|
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
|
||||||
index 6a15a5f7d3e82f61c0f30bb6a339215376d4867d..f34d5b214c4726f3b3b96610c1dca3d0d17a09ab 100644
|
index 3dcbeec94d86f3b56eaf05676b176f60d711f9cd..6818f8496ab76ee6ffc747bd6848b43830ec8914 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Main.java
|
--- a/src/main/java/net/minecraft/server/Main.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Main.java
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
||||||
@@ -132,6 +132,7 @@ public class Main {
|
@@ -132,6 +132,7 @@ public class Main {
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue