19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
22 lines
1 KiB
Diff
22 lines
1 KiB
Diff
From e2d5da82f26b1bcb5f8ebf9a977f52c7da4ef2ff Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
Date: Tue, 8 Jul 2014 09:01:50 +1000
|
|
Subject: [PATCH] Disable ResourceLeakDetector
|
|
|
|
Hopefully no plugins are somehow leaking buffers, but disabling the ResourceLeakDetector is a good thing for performance of the Netty IO subsytem (it's been disabled in BungeeCord for a while now).
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 28c91cd..0c02747 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -126,6 +126,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
|
// Spigot end
|
|
|
|
public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
|
|
+ io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
|
|
this.d = proxy;
|
|
MinecraftServer.k = this;
|
|
// this.universe = file; // CraftBukkit
|
|
--
|
|
2.1.0
|
|
|