Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 12:05:53 +01:00
Code Issues Projects Releases 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 b963196ed5
commit 86e6d961f0
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0336-Anti-Xray.patch
View File

@ -1,4 +1,4 @@
From b97faa806b0369e82235daa8f3360c404c973e1b Mon Sep 17 00:00:00 2001 From 5d077d44d4bbe2d4436cafe783621f53061000c8 Mon Sep 17 00:00:00 2001
From: stonar96 <minecraft.stonar96@gmail.com> From: stonar96 <minecraft.stonar96@gmail.com>
Date: Mon, 20 Aug 2018 03:03:58 +0200 Date: Mon, 20 Aug 2018 03:03:58 +0200
Subject: [PATCH] Anti-Xray Subject: [PATCH] Anti-Xray
@ -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
@@ -17,9 +17,11 @@ import org.bukkit.material.MaterialData; @@ -21,9 +21,11 @@ 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) {
@ -1586,7 +1586,7 @@ index 550416bef..923d1b282 100644
} }
/* pp for tests */ CraftChunkData(int maxHeight) { /* pp for tests */ CraftChunkData(int maxHeight) {
@@ -145,7 +147,7 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData { @@ -157,7 +159,7 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
private ChunkSection getChunkSection(int y, boolean create) { private ChunkSection getChunkSection(int y, boolean create) {
ChunkSection section = sections[y >> 4]; ChunkSection section = sections[y >> 4];
if (create && section == null) { if (create && section == null) {

8
Spigot-Server-Patches/0354-Optimize-and-Fix-ExpiringMap-Issues.patch
View File

@ -1,4 +1,4 @@
From 370fdd742cc646eda4300fc51556ad3a03aacfb1 Mon Sep 17 00:00:00 2001 From 3f0a5b795917411e3c303f2ec75e620d37f6f1d5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 16 Sep 2018 00:00:16 -0400 Date: Sun, 16 Sep 2018 00:00:16 -0400
Subject: [PATCH] Optimize and Fix ExpiringMap Issues Subject: [PATCH] Optimize and Fix ExpiringMap Issues
@ -310,10 +310,10 @@ 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
@@ -144,7 +144,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin @@ -159,7 +159,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
@Override @Override
public Long2ObjectMap<StructureStart> getStructureStartCache(StructureGenerator<? extends WorldGenFeatureConfiguration> structuregenerator) { public Long2ObjectMap<StructureStart> getStructureStartCache(StructureGenerator<? extends WorldGenFeatureConfiguration> structuregenerator) {
return (Long2ObjectMap) this.structureStartCache.computeIfAbsent(structuregenerator, (s) -> { return (Long2ObjectMap) this.structureStartCache.computeIfAbsent(structuregenerator, (s) -> {
@ -322,7 +322,7 @@ index 4cca65666..9c917370a 100644
}); });
} }
@@ -154,7 +154,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin @@ -169,7 +169,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
@Override @Override
public Long2ObjectMap<LongSet> getStructureCache(StructureGenerator<? extends WorldGenFeatureConfiguration> structuregenerator) { public Long2ObjectMap<LongSet> getStructureCache(StructureGenerator<? extends WorldGenFeatureConfiguration> structuregenerator) {
return (Long2ObjectMap) this.structureCache.computeIfAbsent(structuregenerator, (s) -> { return (Long2ObjectMap) this.structureCache.computeIfAbsent(structuregenerator, (s) -> {

2
work/CraftBukkit

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