Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
9c9583cd2 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2020-12-12 18:54:25 -06:00
parent c51e3913e4
commit 258ae0734a
12 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -6535,7 +6535,7 @@ index 2d887af902a33b0e28d8f0a6ac2e59c815a7856e..2291135eaef64c403183724cb6e413cd
@Override
public BlockPosition immutableCopy() {
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index dcbae1c4512cf267719934785ea60de8ae66052d..96bdb95800f337f49d5194fb8d3b32b808a978ca 100644
index 9c078d30afef20bd1ea5975299c5513334829b19..e5169c5c7a71566c22c5b3c4686e56ee65816e53 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -91,6 +91,175 @@ public class Chunk implements IChunkAccess {
@@ -6770,32 +6770,14 @@ index dcbae1c4512cf267719934785ea60de8ae66052d..96bdb95800f337f49d5194fb8d3b32b8
return;
}
if (entity instanceof EntityItem) {
@@ -873,6 +1048,7 @@ public class Chunk implements IChunkAccess {
}
public void a(@Nullable Entity entity, AxisAlignedBB axisalignedbb, List<Entity> list, @Nullable Predicate<? super Entity> predicate) {
+ org.spigotmc.AsyncCatcher.catchOp("Chunk get entities call"); // Tuinity
int i = MathHelper.floor((axisalignedbb.minY - 2.0D) / 16.0D);
int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D);
@@ -912,6 +1088,7 @@ public class Chunk implements IChunkAccess {
}
public <T extends Entity> void a(@Nullable EntityTypes<?> entitytypes, AxisAlignedBB axisalignedbb, List<? super T> list, Predicate<? super T> predicate) {
+ org.spigotmc.AsyncCatcher.catchOp("Chunk get entities (by type) call"); // Tuinity
int i = MathHelper.floor((axisalignedbb.minY - 2.0D) / 16.0D);
int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D);
@@ -941,7 +1118,9 @@ public class Chunk implements IChunkAccess {
@@ -943,6 +1118,7 @@ public class Chunk implements IChunkAccess {
}
+ public final <T extends Entity> void getEntities(Class<? extends T> oclass, AxisAlignedBB axisalignedbb, List<T> list, @Nullable Predicate<? super T> predicate) { this.a(oclass, axisalignedbb, list, predicate); } // Tuinity - OBFHELPER
public <T extends Entity> void a(Class<? extends T> oclass, AxisAlignedBB axisalignedbb, List<T> list, @Nullable Predicate<? super T> predicate) {
+ org.spigotmc.AsyncCatcher.catchOp("Chunk get entities (by class) call"); // Tuinity
org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot
int i = MathHelper.floor((axisalignedbb.minY - 2.0D) / 16.0D);
int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D);
diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
index 8eecdcde510661ec3a13a25a04ba394f6b6dc012..187a639347413a3aef1b6025926e2bf5936c11fd 100644
--- a/src/main/java/net/minecraft/server/ChunkCache.java
@@ -14769,7 +14751,7 @@ index 7511e38130f38703164395a670f12d1af648ff04..e602efcb3fad390bb6bff1055e782bba
}
value.append("},");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca72458d43c2d 100644
index dc7de2b59ec5ca3e5fba34dbb2aa2e6aed8f95cb..a383ba5e897101a3da1544c877148b43be7a6319 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
@@ -14781,7 +14763,7 @@ index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca724
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -856,6 +856,7 @@ public final class CraftServer implements Server {
@@ -861,6 +861,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -14789,7 +14771,7 @@ index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca724
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -890,6 +891,7 @@ public final class CraftServer implements Server {
@@ -895,6 +896,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -14797,7 +14779,7 @@ index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca724
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1853,7 +1855,10 @@ public final class CraftServer implements Server {
@@ -1858,7 +1860,10 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -14809,7 +14791,7 @@ index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca724
}
@Override
@@ -2275,6 +2280,14 @@ public final class CraftServer implements Server {
@@ -2280,6 +2285,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}