@@ -1,4 +1,4 @@
|
||||
From 6ef28f7cbf0936ddb73d5ae8fde5e9b043070e74 Mon Sep 17 00:00:00 2001
|
||||
From 48cf8759487754486c207f668ea1f04163f93f26 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Thu, 14 Feb 2013 17:32:20 +1100
|
||||
Subject: [PATCH] Netty
|
||||
@@ -222,7 +222,7 @@ index 58d30eb..e4e5049 100644
|
||||
// CraftBukkit end
|
||||
this.pendingConnection = pendingconnection;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
index 5a96c86..eb02e56 100644
|
||||
index 15acc97..dbc3e48 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
@@ -18,6 +18,8 @@ public class Spigot {
|
||||
@@ -244,7 +244,7 @@ index 5a96c86..eb02e56 100644
|
||||
+ server.getLogger().severe("[Warning] You have opted not to use Netty, in the future this option may be removed!");
|
||||
+ }
|
||||
+
|
||||
if (metrics != null) {
|
||||
if (metrics == null) {
|
||||
try {
|
||||
metrics = new Metrics();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
|
||||
Reference in New Issue
Block a user