Revert "Experimentally brand as "Spigot". This will be reverted if *any* plugin compatibility issues arise."

This reverts commit 71255cf140.

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 9c03b4f291e4533c4700b4b2a8cce28dc1afda8b Mon Sep 17 00:00:00 2001
+From 8c02318a4530387c90f7598946c11aff46598f38 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
@@ -142,18 +142,9 @@ index 2f06c8e..bec994f 100644
            <execution>
              <phase>package</phase>
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f3e5200..4a525d2 100644
+index f3e5200..596bfcf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -145,7 +145,7 @@ import com.google.common.collect.MapMaker;
- import jline.console.ConsoleReader;
- 
- public final class CraftServer implements Server {
--    private final String serverName = "CraftBukkit";
-+    private final String serverName = "Spigot"; // Spigot
-     private final String serverVersion;
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final ServicesManager servicesManager = new SimpleServicesManager();
 @@ -226,7 +226,7 @@ public final class CraftServer implements Server {
          loadIcon();