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

TagAPI won't load anyway - no need to manually disable it.

Browse Source
This commit is contained in:
md_5 2013-02-20 20:20:27 +11:00
parent 59ccb11830
commit f64b42a456
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From a338352538a36defae230b9cc8b8019e0fd5bc61 Mon Sep 17 00:00:00 2001
From b46a1d3cb2371706ba49c9cf6c1b8919dc6edaa8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 19 Feb 2013 18:30:10 +1100
Subject: [PATCH] Implement TagAPI into Spigot - much more efficient and only a
@ -7,10 +7,9 @@ Subject: [PATCH] Implement TagAPI into Spigot - much more efficient and only a
---
.../net/minecraft/server/EntityTrackerEntry.java | 12 +++-
.../java/net/minecraft/server/MinecraftServer.java | 1 +
.../java/org/bukkit/craftbukkit/CraftServer.java | 7 +++
.../org/kitteh/tag/PlayerReceiveNameTagEvent.java | 49 +++++++++++++++
src/main/java/org/kitteh/tag/TagAPI.java | 73 ++++++++++++++++++++++
5 files changed, 139 insertions(+), 3 deletions(-)
4 files changed, 132 insertions(+), 3 deletions(-)
create mode 100644 src/main/java/org/kitteh/tag/PlayerReceiveNameTagEvent.java
create mode 100644 src/main/java/org/kitteh/tag/TagAPI.java
@ -63,24 +62,6 @@ index 99a6cf4..69564cd 100644
}
public void r() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f00b28d..ed7598e 100644
--- a/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 {
if (pluginFolder.exists()) {
Plugin[] plugins = pluginManager.loadPlugins(pluginFolder);
for (Plugin plugin : plugins) {
+ // Spigot start
+ if (/*plugin.getName().equals("TagAPI")*/false) {
+ getLogger().log(Level.SEVERE, "*** Disabled TagAPI - It is inbuilt into Spigot, and not required ***", new Exception());
+ pluginManager.disablePlugin(plugin);
+ continue;
+ }
+ // Spigot end
try {
String message = String.format("Loading %s", plugin.getDescription().getFullName());
plugin.getLogger().info(message);
diff --git a/src/main/java/org/kitteh/tag/PlayerReceiveNameTagEvent.java b/src/main/java/org/kitteh/tag/PlayerReceiveNameTagEvent.java
new file mode 100644
index 0000000..2ea9e07