Update upstream S

This commit is contained in:
Zach Brown 2017-02-04 03:59:44 -06:00
parent 789bb0b834
commit e3b3799b67
4 changed files with 4 additions and 4 deletions

View file

@ -47,7 +47,7 @@ index 98f2cff15..88437d77a 100644
public final int locZ;
private boolean m;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 279ef5de5..25deecc4d 100644
index 57ae50d2e..0a8e09e5e 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {

View file

@ -22,7 +22,7 @@ index 3db29161d..98f2cff15 100644
// Paper start
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index a6f044461..279ef5de5 100644
index 54b454fe3..57ae50d2e 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {

View file

@ -85,7 +85,7 @@ index 1c0108ef1..b80f95159 100644
TileEntity tileentity;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index e18fb875f..8c015c095 100644
index 3ba489d4f..f7f2d12cf 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {

@ -1 +1 @@
Subproject commit 47414001a0202ebd8bd80feb532b0ef9ce1733a9
Subproject commit b4417b8d188ae9d59bc9fc02bbc5b08690e40f64