Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 01:17:44 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream CB

Browse Source
This commit is contained in:
Zach Brown 2016-10-10 21:29:08 -05:00
parent 5ecb6f1358
commit b2c262e382
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/0034-Generator-Settings.patch
View File

@ -1,4 +1,4 @@
From b183f14705315562623ffaa7bdfce84d4855c4f3 Mon Sep 17 00:00:00 2001 From 614348db3e370b5ac7e74b6c805d2003280a27f8 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 02:17:54 -0600 Date: Wed, 2 Mar 2016 02:17:54 -0600
Subject: [PATCH] Generator Settings Subject: [PATCH] Generator Settings
@ -110,7 +110,7 @@ index aa35a24..ea6a00e 100644
int k = 0; int k = 0;
boolean flag1 = true; boolean flag1 = true;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
index db49131..534fd9f 100644 index ac990af..0722956 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
@@ -158,32 +158,32 @@ public class ChunkProviderGenerate implements ChunkGenerator { @@ -158,32 +158,32 @@ public class ChunkProviderGenerate implements ChunkGenerator {
@ -153,7 +153,7 @@ index db49131..534fd9f 100644
this.B.a(this.n, i, j, chunksnapshot); this.B.a(this.n, i, j, chunksnapshot);
} }
} }
@@ -318,23 +318,23 @@ public class ChunkProviderGenerate implements ChunkGenerator { @@ -323,23 +323,23 @@ public class ChunkProviderGenerate implements ChunkGenerator {
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j); ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
if (this.o) { if (this.o) {
@ -182,7 +182,7 @@ index db49131..534fd9f 100644
this.B.a(this.n, this.i, chunkcoordintpair); this.B.a(this.n, this.i, chunkcoordintpair);
} }
} }
@@ -359,7 +359,7 @@ public class ChunkProviderGenerate implements ChunkGenerator { @@ -364,7 +364,7 @@ public class ChunkProviderGenerate implements ChunkGenerator {
} }
} }
@ -191,7 +191,7 @@ index db49131..534fd9f 100644
for (k1 = 0; k1 < this.s.t; ++k1) { for (k1 = 0; k1 < this.s.t; ++k1) {
l1 = this.i.nextInt(16) + 8; l1 = this.i.nextInt(16) + 8;
i2 = this.i.nextInt(256); i2 = this.i.nextInt(256);
@@ -424,23 +424,23 @@ public class ChunkProviderGenerate implements ChunkGenerator { @@ -429,23 +429,23 @@ public class ChunkProviderGenerate implements ChunkGenerator {
public void recreateStructures(Chunk chunk, int i, int j) { public void recreateStructures(Chunk chunk, int i, int j) {
if (this.o) { if (this.o) {
@ -265,5 +265,5 @@ index c965af1..3ce4449 100644
Iterator iterator = this.c.values().iterator(); Iterator iterator = this.c.values().iterator();
-- --
2.10.0.windows.1 2.9.3

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 9558f31ebb5fe059c10c3590ce92a5f6d3dc3902 Subproject commit 744e1a177a0c98a7690e72a640d6993c12ae4564