SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up imports in the Spigot class.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-25 09:01:05 +10:00
parent ae20c1bdc6
commit 86c9e69b00
5 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CraftBukkit-Patches/0019-Watchdog-Thread.patch
View File

@@ -1,4 +1,4 @@
From f6790305aeed1bb428e4e666a078fb68482bf3b1 Mon Sep 17 00:00:00 2001
From e21977783b759a07c1962b262c1b879a5e118e61 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.
@@ -25,7 +25,7 @@ index 0205822..65a4e9f 100644
this.isStopped = true;
} catch (Throwable throwable1) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 88c2383..ea2b688 100644
index 88c2383..c8d1110 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,5 +1,6 @@
@@ -35,7 +35,22 @@ index 88c2383..ea2b688 100644
import java.io.IOException;
import java.net.InetAddress;
import java.util.ArrayList;
@@ -35,6 +36,8 @@ import org.bukkit.Bukkit;
@@ -21,6 +22,7 @@ import net.minecraft.server.EntityHuman;
import net.minecraft.server.EntityItemFrame;
import net.minecraft.server.EntityLiving;
import net.minecraft.server.EntityMonster;
+import net.minecraft.server.EntityPlayer;
import net.minecraft.server.EntityProjectile;
import net.minecraft.server.EntitySheep;
import net.minecraft.server.EntitySlime;
@@ -29,12 +31,15 @@ import net.minecraft.server.EntityWeather;
import net.minecraft.server.EntityWither;
import net.minecraft.server.MathHelper;
import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.Packet255KickDisconnect;
import net.minecraft.server.PendingConnection;
import net.minecraft.server.World;
import org.bukkit.Bukkit;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.Metrics;
@@ -44,7 +59,7 @@ index 88c2383..ea2b688 100644
public class Spigot {
@@ -48,6 +51,7 @@ public class Spigot {
@@ -48,6 +53,7 @@ public class Spigot {
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -52,7 +67,7 @@ index 88c2383..ea2b688 100644
server.whitelistMessage = configuration.getString("settings.whitelist-message", server.whitelistMessage);
server.stopMessage = configuration.getString("settings.stop-message", server.stopMessage);
@@ -56,6 +60,17 @@ public class Spigot {
@@ -56,6 +62,17 @@ public class Spigot {
server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions");
filterIps = configuration.getBoolean("settings.filter-unsafe-ips", false);
@@ -70,7 +85,7 @@ index 88c2383..ea2b688 100644
server.orebfuscatorEnabled = configuration.getBoolean("orebfuscator.enable", false);
server.orebfuscatorEngineMode = configuration.getInt("orebfuscator.engine-mode", 1);
server.orebfuscatorUpdateRadius = configuration.getInt("orebfuscator.update-radius", 2);
@@ -296,6 +311,66 @@ public class Spigot {
@@ -296,6 +313,66 @@ public class Spigot {
return isActive;
}