Fix patch extras

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-06-08 09:29:32 +10:00
parent 1bda949c57
commit cd95751dc4
6 changed files with 25 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
From 44a54f1f7c3bb73fe9237125a84225324d627570 Mon Sep 17 00:00:00 2001
From 586597e0ad25279f6e81b1e5e710d9e8f8a76f82 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sun, 2 Jun 2013 16:23:46 +1000
Subject: [PATCH] Hopper Cooldowns
@@ -64,10 +64,10 @@ index f6d269d..88b2cb0 100644
iinventory.update();
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 8772350..9b9e9fe 100644
index c7ef0e1..bbfcd97 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -58,6 +58,8 @@ public class Spigot {
@@ -59,6 +59,8 @@ public class Spigot {
public static List<String> bungeeIPs;
public static int textureResolution = 16;
public static final Pattern validName = Pattern.compile("^[a-zA-Z0-9_-]{2,16}$");
@@ -76,7 +76,7 @@ index 8772350..9b9e9fe 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -96,6 +98,8 @@ public class Spigot {
@@ -97,6 +99,8 @@ public class Spigot {
tabPing = configuration.getBoolean("settings.tab-ping", tabPing);
bungeeIPs = configuration.getStringList("settings.bungee-proxies");
textureResolution = configuration.getInt("settings.texture-resolution", textureResolution);