OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-04 10:11:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update upstream CB

Browse source 
--- work/CraftBukkit
Submodule work/CraftBukkit 0e1cea5a..f40143ef:
  > SPIGOT-4691: Fix custom world generator when placing tiles
This commit is contained in:
Zach Brown 2019-04-05 05:17:10 -04:00
parent b5e7b51be6
commit 04f3e0a28f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/Anti-Xray.patch
View file

@ -1571,13 +1571,13 @@ index c25c82bf1..1bd2167aa 100644
if (iblockdata1 == null) { if (iblockdata1 == null) {
// CraftBukkit start - remove blockstate if failed // CraftBukkit start - remove blockstate if failed
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
index 550416bef..923d1b282 100644 index 791017258..29695da2e 100644
--- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
@@ -0,0 +0,0 @@ import org.bukkit.material.MaterialData; @@ -0,0 +0,0 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
public final class CraftChunkData implements ChunkGenerator.ChunkData {
private final int maxHeight; private final int maxHeight;
private final ChunkSection[] sections; private final ChunkSection[] sections;
private Set<BlockPosition> tiles;
+ private World world; // Paper - Anti-Xray + private World world; // Paper - Anti-Xray
public CraftChunkData(World world) { public CraftChunkData(World world) {

2
Spigot-Server-Patches/Optimize-and-Fix-ExpiringMap-Issues.patch
View file

@ -310,7 +310,7 @@ index 38c0201ac..ae271a57f 100644
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
index 4cca65666..9c917370a 100644 index 23f4e24ce..9e553866e 100644
--- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
@@ -0,0 +0,0 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin @@ -0,0 +0,0 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 0e1cea5a4a4b41004912ab7a8b2871349b1ef4a0 Subproject commit f40143ef5e2215b15c08eac481517bd6a0cf7239