Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 03:55:14 +01:00
Code Issues Projects Releases Wiki Activity

Dont disable tagAPI for now

Browse Source
This commit is contained in:
md_5 2013-02-19 20:28:30 +11:00
parent ad40d85a05
commit 1dd5a318d7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CraftBukkit-Patches/0025-Netty.patch
View File

@ -1,7 +1,9 @@
From 5469d039435d438a20d93aaa6724f420f6b24f25 Mon Sep 17 00:00:00 2001 From 6f95844e426222e803501d99305d1c91362e5d3b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 14 Feb 2013 17:32:20 +1100 Date: Thu, 14 Feb 2013 17:32:20 +1100
Subject: [PATCH] Netty Implement an uber efficient network engine based on the Subject: [PATCH] Netty
Implement an uber efficient network engine based on the
Java NIO framework Netty. This is basically a complete rewrite of the Java NIO framework Netty. This is basically a complete rewrite of the
Minecraft network engine with many distinct advantages. First and foremost, Minecraft network engine with many distinct advantages. First and foremost,
there will no longer be the horrid, and redundant case of 2, or even at there will no longer be the horrid, and redundant case of 2, or even at
@ -28,7 +30,6 @@ Subject: [PATCH] Netty Implement an uber efficient network engine based on the
as well as various other side benefits such as chat thread pooling and a as well as various other side benefits such as chat thread pooling and a
slight reduction in latency. This commit is licensed under the Creative slight reduction in latency. This commit is licensed under the Creative
Commons Attribution-ShareAlike 3.0 Unported license. Commons Attribution-ShareAlike 3.0 Unported license.
--- ---
pom.xml | 5 + pom.xml | 5 +
.../java/net/minecraft/server/DedicatedServer.java | 4 +- .../java/net/minecraft/server/DedicatedServer.java | 4 +-

6
CraftBukkit-Patches/0028-Implement-TagAPI-into-Spigot-much-more-efficient-and.patch
View File

@ -1,4 +1,4 @@
From c3405bf6fd35a6b90d17bde92a33872b8c9b9404 Mon Sep 17 00:00:00 2001 From b4957d9a35c28888d9f56ed176d396f5f6d9d944 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 19 Feb 2013 18:30:10 +1100 Date: Tue, 19 Feb 2013 18:30:10 +1100
Subject: [PATCH] Implement TagAPI into Spigot - much more efficient and only a Subject: [PATCH] Implement TagAPI into Spigot - much more efficient and only a
@ -49,7 +49,7 @@ index 27a548f..d95d5af 100644
if (this.tracker instanceof EntityMinecart) { if (this.tracker instanceof EntityMinecart) {
EntityMinecart entityminecart = (EntityMinecart) this.tracker; EntityMinecart entityminecart = (EntityMinecart) this.tracker;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f00b28d..c42d1c3 100644 index f00b28d..ed7598e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -266,6 +266,13 @@ public final class CraftServer implements Server { @@ -266,6 +266,13 @@ public final class CraftServer implements Server {
@ -57,7 +57,7 @@ index f00b28d..c42d1c3 100644
Plugin[] plugins = pluginManager.loadPlugins(pluginFolder); Plugin[] plugins = pluginManager.loadPlugins(pluginFolder);
for (Plugin plugin : plugins) { for (Plugin plugin : plugins) {
+ // Spigot start + // Spigot start
+ if (plugin.getName().equals("TagAPI")) { + if (/*plugin.getName().equals("TagAPI")*/false) {
+ getLogger().log(Level.SEVERE, "*** Disabled TagAPI - It is inbuilt into Spigot, and not required ***", new Exception()); + getLogger().log(Level.SEVERE, "*** Disabled TagAPI - It is inbuilt into Spigot, and not required ***", new Exception());
+ pluginManager.disablePlugin(plugin); + pluginManager.disablePlugin(plugin);
+ continue; + continue;