Update upstream B/CB/S

This commit is contained in:
Zach Brown 2018-01-04 02:04:31 -06:00
parent a101fadf4f
commit ef505a9a32
5 changed files with 10 additions and 10 deletions

View file

@ -77,7 +77,7 @@ index 0abad9ad..14dda205 100644
/**
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 2a1974ec..c9805bb9 100644
index ca9c7796..a7d87d2d 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -0,0 +0,0 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
This lets you disable it for some worlds and lower it for others.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 74a49a5f..3a942c76 100644
index 74a49a5fb..3a942c763 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 74a49a5f..3a942c76 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4e8ce79f..2300ee10 100644
index 4e8ce79ff..2300ee10b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -39,7 +39,7 @@ index 4e8ce79f..2300ee10 100644
if (i1 - j > 1000L) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 279f0a26..a0b36b6b 100644
index 279f0a261..a0b36b6ba 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
@ -54,11 +54,11 @@ index 279f0a26..a0b36b6b 100644
public void a(Packet<?> packet) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 728d0ff8..c1588879 100644
index 5d15d5846..bc048f292 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
System.out.println("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
if (internal.getWorld().getKeepSpawnInMemory()) {
- short short1 = 196;
@ -67,7 +67,7 @@ index 728d0ff8..c1588879 100644
for (int j = -short1; j <= short1; j += 16) {
for (int k = -short1; k <= short1; k += 16) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 01fc193d..69dc11e2 100644
index 01fc193db..69dc11e2b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld implements World {

@ -1 +1 @@
Subproject commit 07afa3d58b1869147b5e6b44e1227001512a68d1
Subproject commit 8707a3a572bcd4168e2548d06b050b10d5dc5582

@ -1 +1 @@
Subproject commit 360629ec5a02f32a56aa0d82ff99d87b68fa45f7
Subproject commit dc7d31b00d121c486660fafc9d6b4eb38e9db76d

@ -1 +1 @@
Subproject commit bb614f841467a4bfa110bbed2c9fbc638bc68369
Subproject commit 325fbc7f164aeab1f169e47374a9bdd0d67cc8ba