SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-07 17:16:57 +10:00
parent fe5a2d46bd
commit 3eb0f032f0
13 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@@ -1,11 +1,11 @@
From fd0c4c152a4a3c0d4bc8d5c4471715695c9c6b4b Mon Sep 17 00:00:00 2001
From f286b76dd6551fc08ca2f1a0a83e3498f2454cd9 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
diff --git a/pom.xml b/pom.xml
index 8139fbf..afe0225 100644
index a46ecbd..0e6c422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 8139fbf..afe0225 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.6.2-R0.1-SNAPSHOT</version>
<version>1.6.2-R0.2-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@@ -140,7 +140,7 @@ index 8139fbf..afe0225 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 6cb50b7..00326c1 100644
index df2efe2..d9396f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -208,7 +208,7 @@ public final class CraftServer implements Server {

10
CraftBukkit-Patches/0024-Netty.patch
View File

@@ -1,11 +1,11 @@
From 6a0aa29e1762ab96b8f3f1f1957c266925e06fec Mon Sep 17 00:00:00 2001
From 147b1c393ad343fe4f3449ed7c61ee9430947587 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:06:29 +1000
Subject: [PATCH] Netty
diff --git a/pom.xml b/pom.xml
index afe0225..8be284c 100644
index 0e6c422..401dd2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,21 @@
@@ -15,12 +15,12 @@ index afe0225..8be284c 100644
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>4.0.4.Final</version>
+ <version>4.0.6.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.0.4.Final</version>
+ <version>4.0.6.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
@@ -160,7 +160,7 @@ index c9e187e..b433c60 100644
this.b = true;
} catch (Exception exception) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index a0d5047..736ba25 100644
index 8499c7f..e5a09b3 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,8 @@ import java.io.IOException;

6
CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch
View File

@@ -1,4 +1,4 @@
From 11737192759a711cb1692aadb207692b3f003f91 Mon Sep 17 00:00:00 2001
From ba298d9ef487cec55284286782d87dcba11a9f05 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 08:20:26 +1000
Subject: [PATCH] Do Not Search for Offline Players
@@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e65c752..389f80e 100644
index 84ff542..c127f2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1094,7 +1094,7 @@ public final class CraftServer implements Server {
@@ -1098,7 +1098,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {

6
CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch
View File

@@ -1,14 +1,14 @@
From 0609e78093f3d90c3cffe1c7592b3260b4283244 Mon Sep 17 00:00:00 2001
From 31f79e7e3a92d88ec1e3290104c71311d20b5d93 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 389f80e..267605b 100644
index c127f2a..0fa69ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1361,7 +1361,7 @@ public final class CraftServer implements Server {
@@ -1365,7 +1365,7 @@ public final class CraftServer implements Server {
public List<String> tabCompleteCommand(Player player, String message) {
List<String> completions = null;
try {