Update Netty to 4.0.0-Beta3 + reapply patches for new index info.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-17 09:14:16 +11:00
parent 36dd1f54b3
commit d9002e97ca
8 changed files with 60 additions and 78 deletions

View File

@@ -1,4 +1,4 @@
From be497e7130a81fcdaa1877cf6297141325992a16 Mon Sep 17 00:00:00 2001
From 7e3f05017b31d259c4f88ef191b69f78f0a1ef10 Mon Sep 17 00:00:00 2001
From: lishid <lishid@gmail.com>
Date: Sat, 16 Feb 2013 10:05:25 +1100
Subject: [PATCH] Add oreobfuscator for Spigot.
@@ -140,10 +140,10 @@ index 8f65601..16460b6 100644
private boolean value = true;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 359f065..449f3e1 100644
index 0261647..38e551b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -119,6 +119,8 @@ public class CraftWorld implements World {
@@ -121,6 +121,8 @@ public class CraftWorld implements World {
viewDistance = Bukkit.getServer().getViewDistance();
viewDistance = configuration.getInt("world-settings." + name + ".view-distance", viewDistance);
@@ -152,7 +152,7 @@ index 359f065..449f3e1 100644
server.getLogger().info("-------------- Spigot ----------------");
server.getLogger().info("-------- World Settings For [" + name + "] --------");
server.getLogger().info("Growth Per Chunk: " + growthPerTick);
@@ -135,6 +137,7 @@ public class CraftWorld implements World {
@@ -137,6 +139,7 @@ public class CraftWorld implements World {
server.getLogger().info("Tree Growth Modifier: " + treeGrowthModifier);
server.getLogger().info("Mushroom Growth Modifier: " + mushroomGrowthModifier);
server.getLogger().info("View distance: " + viewDistance);
@@ -160,7 +160,7 @@ index 359f065..449f3e1 100644
server.getLogger().info("-------------------------------------------------");
// Spigot end
}
@@ -146,6 +149,7 @@ public class CraftWorld implements World {
@@ -148,6 +151,7 @@ public class CraftWorld implements World {
public int mobSpawnRange = 4;
public int aggregateTicks = 4;
public int viewDistance;