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

Upstream merge + remove 3 pulled patches.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-12 10:17:46 +10:00
parent 70387ed9d8
commit 754e2b5680
28 changed files with 42 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From f286b76dd6551fc08ca2f1a0a83e3498f2454cd9 Mon Sep 17 00:00:00 2001
From 798b905a01eca318b3579cd5127edc42cce24c26 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 a46ecbd..0e6c422 100644
index f23621d..825c821 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index a46ecbd..0e6c422 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.6.2-R0.2-SNAPSHOT</version>
<version>1.6.2-R1.1-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>

6
CraftBukkit-Patches/0029-BungeeCord-Support.patch
View File

@@ -1,4 +1,4 @@
From 1c934e1c78a8d17c3517bbcf230dc728aeeefe88 Mon Sep 17 00:00:00 2001
From ba5620ccf386fd94ddce7fe2158550ece485f03a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support
@@ -28,10 +28,10 @@ index 7f2c1a9..5593b62 100644
+ // Spigot end
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 0f17c90..388acf9 100644
index 5dafeaf..a85fc5b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -295,7 +295,7 @@ public abstract class PlayerList {
@@ -296,7 +296,7 @@ public abstract class PlayerList {
// depending on the outcome.
EntityPlayer entity = new EntityPlayer(this.server, this.server.getWorldServer(0), s, this.server.O() ? new DemoPlayerInteractManager(this.server.getWorldServer(0)) : new PlayerInteractManager(this.server.getWorldServer(0)));
Player player = entity.getBukkitEntity();

6
CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
View File

@@ -1,4 +1,4 @@
From 0a8a33e98273e97eed1086de950036935d1cd42a Mon Sep 17 00:00:00 2001
From c46ce6480300baa0776e9783f66f5dfdd027cadf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved Ping Sending
@@ -17,10 +17,10 @@ index 58e5217..f9ac1e1 100644
public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 388acf9..b7b1c45 100644
index a85fc5b..20b9c5d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -719,6 +719,25 @@ public abstract class PlayerList {
@@ -720,6 +720,25 @@ public abstract class PlayerList {
this.sendAll(new Packet201PlayerInfo(entityplayer.getName(), true, entityplayer.ping));
}
// CraftBukkit end */

6
CraftBukkit-Patches/0041-Prevent-Shutdown-Hang.patch
View File

@@ -1,4 +1,4 @@
From fb7a0b89a5948ad072b6b47c7cfbf24d58290fe2 Mon Sep 17 00:00:00 2001
From 0dc0c332b02bfa4d76bc029e89a6c59f28b13198 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 11:54:32 +1000
Subject: [PATCH] Prevent Shutdown Hang
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Shutdown Hang
Prevents server hanging if players disconnect during the shutdown sequence.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index f0bc5c4..16df7ae 100644
index 20b9c5d..a85157b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1063,7 +1063,14 @@ public abstract class PlayerList {
@@ -1064,7 +1064,14 @@ public abstract class PlayerList {
public void r() {
while (!this.players.isEmpty()) {

8
CraftBukkit-Patches/0049-Configurable-Messages.patch
View File

@@ -1,4 +1,4 @@
From e87093815494e4ca3a4c9d1f7f85bc918a60b278 Mon Sep 17 00:00:00 2001
From bd3a9ccfa048c4e5f99c2add256cdca7789a5a07 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@@ -21,10 +21,10 @@ index 5e9dad2..9deb9d1 100644
} else {
this.loginKey = this.server.getOnlineMode() ? Long.toString(random.nextLong(), 16) : "-";
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 38e0c5b..262682d 100644
index a85157b..e5a259d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -309,7 +309,7 @@ public abstract class PlayerList {
@@ -310,7 +310,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1);
} else if (!this.isWhitelisted(s)) {
@@ -33,7 +33,7 @@ index 38e0c5b..262682d 100644
} else {
String s2 = socketaddress.toString();
@@ -325,7 +325,7 @@ public abstract class PlayerList {
@@ -326,7 +326,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s3);
} else if (this.players.size() >= this.maxPlayers) {

4
CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch → CraftBukkit-Patches/0057-Entity-Mount-and-Dismount-Events.patch
View File

@@ -1,11 +1,11 @@
From f7d44988922838f78b93465580dc27ec4e8067bb Mon Sep 17 00:00:00 2001
From b77192c2e8533c8be00f0beeb661b62849c35110 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:49 +1000
Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9c737ec..ee1ce90 100644
index fe856fc..60c2221 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1427,6 +1427,7 @@ public abstract class Entity {

22
CraftBukkit-Patches/0057-Silence-End-of-Stream-Errors.patch
View File

@@ -1,22 +0,0 @@
From d28b69277fa9bed23920302ea95067c175e5e11f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:51:38 +1000
Subject: [PATCH] Silence End of Stream Errors
diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
index 391c6fc..b5e0261 100644
--- a/src/main/java/net/minecraft/server/Packet.java
+++ b/src/main/java/net/minecraft/server/Packet.java
@@ -112,7 +112,7 @@ public abstract class Packet {
++o;
p += (long) packet.a();
} catch (EOFException eofexception) {
- iconsolelogmanager.severe("Reached end of stream for " + socket.getInetAddress());
+ // iconsolelogmanager.severe("Reached end of stream for " + socket.getInetAddress()); // Spigot - too spammy
return null;
}
--
1.8.1.2

2
CraftBukkit-Patches/0059-Colour-Console-Messages.patch → CraftBukkit-Patches/0058-Colour-Console-Messages.patch
View File

@@ -1,4 +1,4 @@
From b27b1cb7d8b50442631a95271b364bc41e38a0c0 Mon Sep 17 00:00:00 2001
From 33ca90c41ee7904b893c767d1ea6e66f55c83778 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 4 Jul 2013 10:11:46 +1000
Subject: [PATCH] Colour Console Messages

2
CraftBukkit-Patches/0060-Properly-Consume-Bonemeal-in-Dispensers.patch → CraftBukkit-Patches/0059-Properly-Consume-Bonemeal-in-Dispensers.patch
View File

@@ -1,4 +1,4 @@
From 3e68f19219ef911b0c48d121fabe3bf34f4d8a02 Mon Sep 17 00:00:00 2001
From 43da205a1bc25ac30b44a6367b7d7f35ebe90818 Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Mon, 10 Jun 2013 16:04:38 -0400
Subject: [PATCH] Properly Consume Bonemeal in Dispensers

6
CraftBukkit-Patches/0061-Prevent-Ghost-Players-Caused-by-Plugins.patch → CraftBukkit-Patches/0060-Prevent-Ghost-Players-Caused-by-Plugins.patch
View File

@@ -1,4 +1,4 @@
From 20c689599b300747b7b102d0ef48e917b3e6ffdb Mon Sep 17 00:00:00 2001
From 3d38cee38e3984d42237d7353b000051be2be0c6 Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 79c3b98..971cfa5 100644
index e5a259d..bb13b41 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -422,6 +422,9 @@ public abstract class PlayerList {
@@ -423,6 +423,9 @@ public abstract class PlayerList {
Player respawnPlayer = this.cserver.getPlayer(entityplayer1);
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
this.cserver.getPluginManager().callEvent(respawnEvent);

2
CraftBukkit-Patches/0063-Entity-ticking-chunk-caching.patch → CraftBukkit-Patches/0061-Entity-ticking-chunk-caching.patch
View File

@@ -1,4 +1,4 @@
From 26354fbb3ff5283b869fb241c465d508539f8b6c Mon Sep 17 00:00:00 2001
From ea70179245470f2baf92f73a45c87e36e654edbc Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Tue, 16 Jul 2013 03:32:32 +0500
Subject: [PATCH] Entity ticking chunk caching

89
CraftBukkit-Patches/0062-Console-Command-Completion.patch
View File

@@ -1,89 +0,0 @@
From f0b905b9c4e67f0594a46c19bcab3f9d70984fcb Mon Sep 17 00:00:00 2001
From: Phillip Schichtel <quick_wango@code-infection.de>
Date: Fri, 5 Jul 2013 21:55:00 +1000
Subject: [PATCH] Console Command Completion
changed exception handling
wrapped the tab completion in a waitable to sync it with the main thread
Implement command tab completion in the console. Adds BUKKIT-4168
Even though JLine provides an API for tab completion, there was still now tab
completion for console commands.
This commit implements tab completion in the console by providing the
ConsoleReader with a Completer implementation.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c4fc9d0..de4a430 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -17,6 +17,7 @@ import java.util.Map.Entry;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.chunkio.ChunkIOExecutor;
+import org.bukkit.craftbukkit.command.ConsoleCommandCompleter;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@@ -55,6 +56,7 @@ public abstract class PlayerList {
public PlayerList(MinecraftServer minecraftserver) {
minecraftserver.server = new CraftServer(minecraftserver, this);
minecraftserver.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance();
+ minecraftserver.reader.addCompleter(new ConsoleCommandCompleter(minecraftserver.server));
this.cserver = minecraftserver.server;
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
new file mode 100644
index 0000000..a889ff3
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
@@ -0,0 +1,46 @@
+package org.bukkit.craftbukkit.command;
+
+import jline.console.completer.Completer;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.util.Waitable;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.logging.Level;
+
+public class ConsoleCommandCompleter implements Completer {
+ private final CraftServer server;
+
+ public ConsoleCommandCompleter(CraftServer server) {
+ this.server = server;
+ }
+
+ public int complete(final String buffer, final int cursor, final List<CharSequence> candidates) {
+ Waitable<List<String>> waitable = new Waitable<List<String>>() {
+ @Override
+ protected List<String> evaluate() {
+ return server.getCommandMap().tabComplete(server.getConsoleSender(), buffer);
+ }
+ };
+ this.server.getServer().processQueue.add(waitable);
+ try {
+ List<String> offers = waitable.get();
+ if (offers == null) {
+ return cursor;
+ }
+ candidates.addAll(offers);
+
+ final int lastSpace = buffer.lastIndexOf(' ');
+ if (lastSpace == -1) {
+ return cursor - buffer.length();
+ } else {
+ return cursor - (buffer.length() - lastSpace - 1);
+ }
+ } catch (ExecutionException e) {
+ this.server.getLogger().log(Level.WARNING, "Unhandled exception when tab completing", e);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ return cursor;
+ }
+}
--
1.8.1.2

2
CraftBukkit-Patches/0064-Plug-World-Unload-Memory-Leak.patch → CraftBukkit-Patches/0062-Plug-World-Unload-Memory-Leak.patch
View File

@@ -1,4 +1,4 @@
From 54c3ceea8ea9090db66f89766911761c7b403c17 Mon Sep 17 00:00:00 2001
From e5bd78ed743866ec5f4f420dd52958e0f282c92e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:02:59 +1000
Subject: [PATCH] Plug World Unload Memory Leak

2
CraftBukkit-Patches/0065-Player-Collision-API.patch → CraftBukkit-Patches/0063-Player-Collision-API.patch
View File

@@ -1,4 +1,4 @@
From 1d4628a69a0585ad73dda98159ccbe810a9a0da5 Mon Sep 17 00:00:00 2001
From a9a560dff16cb6e448c85a9f664bab13a424e463 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API

2
CraftBukkit-Patches/0066-Fully-Disable-Snooper-When-Not-Required.patch → CraftBukkit-Patches/0064-Fully-Disable-Snooper-When-Not-Required.patch
View File

@@ -1,4 +1,4 @@
From 576ae6ea5b3348156429e5a72987eaf6184be3df Mon Sep 17 00:00:00 2001
From 327957a56aa86e4278af0f73d85ad1e6d225ecbf Mon Sep 17 00:00:00 2001
From: agentk20 <agentkid20@gmail.com>
Date: Sat, 3 Aug 2013 19:28:48 +1000
Subject: [PATCH] Fully Disable Snooper When Not Required

2
CraftBukkit-Patches/0067-Add-Getter-for-Entity-Invulnerability.patch → CraftBukkit-Patches/0065-Add-Getter-for-Entity-Invulnerability.patch
View File

@@ -1,4 +1,4 @@
From b587388cf6df919971622d6b67d78f7750928231 Mon Sep 17 00:00:00 2001
From 8a9ef0403468ad7597e4b0e70ae3a61a18bf88b0 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sat, 3 Aug 2013 19:53:48 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability

2
CraftBukkit-Patches/0068-Guard-entity-list.patch → CraftBukkit-Patches/0066-Guard-entity-list.patch
View File

@@ -1,4 +1,4 @@
From c3d0cccd2b134602ccc7b99039b308efa4c360ee Mon Sep 17 00:00:00 2001
From 284f5650477cb3ccaedd228fbaa6439e8a8e8bd9 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Sat, 3 Aug 2013 21:42:00 +0500
Subject: [PATCH] Guard entity list

2
CraftBukkit-Patches/0069-Cap-Minimum-Player-Speed.patch → CraftBukkit-Patches/0067-Cap-Minimum-Player-Speed.patch
View File

@@ -1,4 +1,4 @@
From 20ef1354a9a56fd07cfbd6285273acaf7d1edfa2 Mon Sep 17 00:00:00 2001
From d11fddbdd62a2be3e66fc9623661403ffcd17faf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed