Update with latest patches from upstream SpigotMC

2014-09-21 22:05:59 -05:00
parent 4c10135801
commit 64acfb63bc
9 changed files with 1379 additions and 41 deletions
--- a/Bukkit-Patches/0032-Spigot-Update-20140909a.patch
+++ b/Bukkit-Patches/0032-Spigot-Update-20140909a.patch
@@ -0,0 +1,99 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Thu, 11 Sep 2014 01:06:54 -0700
+Subject: [PATCH] Spigot Update - 20140909a
+
+
+diff --git a/pom.xml b/pom.xml
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -0,0 +0,0 @@
+         <relativePath>../pom.xml</relativePath>
+     </parent>
+ 
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/public</url>
+        </repository>
+    </repositories>
+
+     <build>
+         <plugins>
+             <plugin>
+@@ -0,0 +0,0 @@
+     </build>
+     <dependencies>
+         <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-chat</artifactId>
+            <version>1.8-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+             <groupId>org.yaml</groupId>
+             <artifactId>snakeyaml</artifactId>
+             <version>1.12</version>
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
+@@ -0,0 +0,0 @@ import java.util.Set;
+ import java.util.UUID;
+ import java.util.logging.Logger;
+ 
+import net.md_5.bungee.api.chat.BaseComponent;
+ import org.bukkit.Warning.WarningState;
+ import org.bukkit.command.CommandException;
+ import org.bukkit.command.CommandSender;
+@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
+         {
+             throw new UnsupportedOperationException( "Not supported yet." );
+         }
+
+        public void broadcast(BaseComponent component)
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
+        }
+
+        public void broadcast(BaseComponent... components)
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
+        }
+     }
+ 
+     Spigot spigot();
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -0,0 +0,0 @@ package org.bukkit.entity;
+ 
+ import java.net.InetSocketAddress;
+ 
+import net.md_5.bungee.api.chat.BaseComponent;
+ import org.bukkit.Achievement;
+ import org.bukkit.ChatColor;
+ import org.bukkit.Effect;
+@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+         {
+             throw new UnsupportedOperationException( "Not supported yet." );
+         }
+
+        public void sendMessage(BaseComponent component)
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
+        }
+
+        public void sendMessage(BaseComponent... components)
+        {
+            throw new UnsupportedOperationException( "Not supported yet." );
+        }
+     }
+ 
+     Spigot spigot();
+-- 
+1.9.4.msysgit.0
+