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

Upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-18 17:48:18 +11:00
parent be8c216be7
commit 72cde1fd01
36 changed files with 109 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 654a9071d73b6cf7a30503340743cb1481b185b5 Mon Sep 17 00:00:00 2001
From e1577d7f4aa7a223ab9203f5adf601402694f23d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index a83e578..e1f4e61 100644
index 2a947f6..0bc95a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index a83e578..e1f4e61 100644
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.7.2-R0.1-SNAPSHOT</version>
<version>1.7.2-R0.2-SNAPSHOT</version>
- <name>Bukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name>

10
Bukkit-Patches/0002-Measure-Timings-Duration.patch
View File

@@ -1,11 +1,11 @@
From f20ab58bf8d3bcf2d7fe5e8275d3127874bbd61a Mon Sep 17 00:00:00 2001
From 33cf8909fd2af5abf1f2a64b7bc3ff1ecdc9e9b8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Measure Timings Duration
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
index 29ebbe0..3c4ef89 100644
index 05cfcb0..c2874f1 100644
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
@@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableList;
@@ -37,10 +37,10 @@ index 29ebbe0..3c4ef89 100644
if (separate) sender.sendMessage("Names written to " + names.getPath());
} catch (IOException e) {
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 93fb4f5..a96a33b 100644
index 3c9611b..2c4b03b 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -274,6 +274,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -275,6 +275,7 @@ public final class SimplePluginManager implements PluginManager {
}
}
@@ -49,5 +49,5 @@ index 93fb4f5..a96a33b 100644
}
--
1.8.1.2
1.8.3.2

20
Bukkit-Patches/0006-BungeeCord-Support.patch
View File

@@ -1,14 +1,14 @@
From 90e7f1b07d3998ff3eabc59edb00fe2993b02eb8 Mon Sep 17 00:00:00 2001
From 912392969b3e727b360b37836a85b2456ad7c991 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3ec374b..cc9c3b2 100644
index 7aa697d..22bce07 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -721,4 +721,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -788,4 +788,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @see Player#setHealthScaled(boolean)
*/
public double getHealthScale();
@@ -33,7 +33,7 @@ index 3ec374b..cc9c3b2 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
index 60c0875..dab3c5c 100644
index b74b7b8..8fb1c98 100644
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
@@ -14,6 +14,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -44,9 +44,9 @@ index 60c0875..dab3c5c 100644
/**
* @deprecated Address should be provided in other constructor
@@ -38,10 +39,17 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param hostname The hostname that was used to connect to the server
* @param address The address the player used to connect, provided for timing issues
@@ -40,10 +41,17 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param address The address the player used to connect, provided for
* timing issues
*/
- public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address) {
+ public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address, final InetAddress realAddress) { // Spigot
@@ -63,7 +63,7 @@ index 60c0875..dab3c5c 100644
}
/**
@@ -49,7 +57,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -52,7 +60,7 @@ public class PlayerLoginEvent extends PlayerEvent {
*/
@Deprecated
public PlayerLoginEvent(final Player player, final Result result, final String message) {
@@ -72,7 +72,7 @@ index 60c0875..dab3c5c 100644
}
/**
@@ -61,12 +69,23 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -65,12 +73,23 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param result The result status for this event
* @param message The message to be displayed if result denies login
*/
@@ -99,5 +99,5 @@ index 60c0875..dab3c5c 100644
* Gets the current result of the login, as an enum
*
--
1.8.1.2
1.8.3.2

25
Bukkit-Patches/0008-Add-Particle-API.patch
View File

@@ -1,11 +1,11 @@
From ae6b528446bfbe1c5c5e8d4301287364f0cc8ddd Mon Sep 17 00:00:00 2001
From bb9b6439fcc6c3657b5f778b681e39e0f1b9ee34 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
index 708bee9..62c7c11 100644
index 2474a2d..4a4a12d 100644
--- a/src/main/java/org/bukkit/Effect.java
+++ b/src/main/java/org/bukkit/Effect.java
@@ -5,6 +5,7 @@ import java.util.Map;
@@ -16,7 +16,7 @@ index 708bee9..62c7c11 100644
import org.bukkit.potion.Potion;
/**
@@ -78,27 +79,178 @@ public enum Effect {
@@ -79,27 +80,178 @@ public enum Effect {
/**
* The flames seen on a mobspawner; a visual effect.
*/
@@ -199,7 +199,7 @@ index 708bee9..62c7c11 100644
* @deprecated Magic value
*/
@Deprecated
@@ -107,6 +259,15 @@ public enum Effect {
@@ -108,6 +260,15 @@ public enum Effect {
}
/**
@@ -215,16 +215,17 @@ index 708bee9..62c7c11 100644
* @return The type of the effect.
*/
public Type getType() {
@@ -114,7 +275,7 @@ public enum Effect {
@@ -115,8 +276,7 @@ public enum Effect {
}
/**
- * @return The class which represents data for this effect, or null if none
- * @return The class which represents data for this effect, or null if
- * none
+ * @return if this Effect isn't of type PARTICLE it returns the class which represents data for this effect, or null if none
*/
public Class<?> getData() {
return this.data;
@@ -134,12 +295,32 @@ public enum Effect {
@@ -136,12 +296,32 @@ public enum Effect {
static {
for (Effect effect : values()) {
@@ -260,10 +261,10 @@ index 708bee9..62c7c11 100644
+ public enum Type {SOUND, VISUAL, PARTICLE}
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 62fadda..39c72c5 100644
index f02bfb7..a58eb05 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1070,6 +1070,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1151,6 +1151,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);
@@ -321,10 +322,10 @@ index 62fadda..39c72c5 100644
* Represents various map environment types that a world may be
*/
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index cc9c3b2..8eab616 100644
index 22bce07..9b4c28f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -736,6 +736,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -803,6 +803,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@@ -354,5 +355,5 @@ index 08aa71d..5217aec 100644
}
}
--
1.8.1.2
1.8.3.2

10
Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch
View File

@@ -1,4 +1,4 @@
From f4c3f11329a362ba8a213030895b1cf04fe85f46 Mon Sep 17 00:00:00 2001
From e4aaa81f0b3679aecf548da2945c84bd4af3b53d Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:01 -0500
Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent
Defines EntitySpawnEvent and SpawnerSpawnEvent. Adds BUKKIT-267 and BUKKIT-1559
diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
index 24c4ebf..ed9c4a0 100644
index 3055ea7..6bde0fe 100644
--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
@@ -4,17 +4,13 @@ import org.bukkit.Location;
@@ -57,8 +57,8 @@ index 24c4ebf..ed9c4a0 100644
- /**
* Gets the type of creature being spawned.
*
* @return A CreatureType value detailing the type of creature being spawned
@@ -70,15 +49,6 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
* @return A CreatureType value detailing the type of creature being
@@ -72,15 +51,6 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
return spawnReason;
}
@@ -216,5 +216,5 @@ index 0000000..1acb3c4
+ }
+}
--
1.8.1.2
1.8.3.2

14
Bukkit-Patches/0013-Added-getAllSessionData-to-the-Conversation-API.patch
View File

@@ -1,14 +1,14 @@
From 5d672b1aa92376a8e13540221f774f14ff96b2d7 Mon Sep 17 00:00:00 2001
From 061b904c4d4c86c60283080b60e44d0a7ca68abe Mon Sep 17 00:00:00 2001
From: Alex Bennett <alex.eugene.bennett@gmail.com>
Date: Thu, 11 Jul 2013 15:31:32 -0500
Subject: [PATCH] Added getAllSessionData() to the Conversation API.
diff --git a/src/main/java/org/bukkit/conversations/ConversationContext.java b/src/main/java/org/bukkit/conversations/ConversationContext.java
index 7a5b5ed..6b4bcac 100644
index 4f33ff4..7390a77 100644
--- a/src/main/java/org/bukkit/conversations/ConversationContext.java
+++ b/src/main/java/org/bukkit/conversations/ConversationContext.java
@@ -44,6 +44,14 @@ public class ConversationContext {
@@ -46,6 +46,14 @@ public class ConversationContext {
}
/**
@@ -20,9 +20,9 @@ index 7a5b5ed..6b4bcac 100644
+ }
+
+ /**
* Gets session data shared between all {@link Prompt} invocations. Use this as a way
* to pass data through each Prompt as the conversation develops.
*
* Gets session data shared between all {@link Prompt} invocations. Use
* this as a way to pass data through each Prompt as the conversation
* develops.
--
1.8.1.2
1.8.3.2

10
Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch
View File

@@ -1,14 +1,14 @@
From 8c044d475e5ebdf5ad41667d3db04a03cf4dc33f Mon Sep 17 00:00:00 2001
From 8c588a47e59db68d802c08d47f9be97bc4c5e09a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 22 Jul 2013 19:09:43 +1000
Subject: [PATCH] Catch Conversation API Errors
diff --git a/src/main/java/org/bukkit/conversations/Conversation.java b/src/main/java/org/bukkit/conversations/Conversation.java
index a30745f..55c9785 100644
index d4c1f6d..46912c8 100644
--- a/src/main/java/org/bukkit/conversations/Conversation.java
+++ b/src/main/java/org/bukkit/conversations/Conversation.java
@@ -193,6 +193,7 @@ public class Conversation {
@@ -209,6 +209,7 @@ public class Conversation {
* @param input The user's chat text.
*/
public void acceptInput(String input) {
@@ -16,7 +16,7 @@ index a30745f..55c9785 100644
if (currentPrompt != null) {
// Echo the user's input
@@ -212,6 +213,12 @@ public class Conversation {
@@ -228,6 +229,12 @@ public class Conversation {
currentPrompt = currentPrompt.acceptInput(context, input);
outputNextPrompt();
}
@@ -30,5 +30,5 @@ index a30745f..55c9785 100644
/**
--
1.8.1.2
1.8.3.2

8
Bukkit-Patches/0015-Player-Collision-API.patch
View File

@@ -1,14 +1,14 @@
From 64dc76e6adadefc5072c492ca1ebd81e88fa95a9 Mon Sep 17 00:00:00 2001
From 25627541c2c5d7e0ead8ddeb5ceb54f7fc2f9fd5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8eab616..9ee8f5f 100644
index 9b4c28f..ba0ce2b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -741,6 +741,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -808,6 +808,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@@ -37,5 +37,5 @@ index 8eab616..9ee8f5f 100644
Spigot spigot();
--
1.8.1.2
1.8.3.2

8
Bukkit-Patches/0016-Expand-Boolean-Prompt-Values.patch
View File

@@ -1,14 +1,14 @@
From f8a6577edc2c37aa3bc8cffd9fbf29491488bade Mon Sep 17 00:00:00 2001
From 09ffec47d3a03dc0b86bcd303bebe6bb837ddd39 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:42:16 +1000
Subject: [PATCH] Expand Boolean Prompt Values
diff --git a/src/main/java/org/bukkit/conversations/BooleanPrompt.java b/src/main/java/org/bukkit/conversations/BooleanPrompt.java
index 6abb354..a51e754 100644
index 3f2c97f..81ef78c 100644
--- a/src/main/java/org/bukkit/conversations/BooleanPrompt.java
+++ b/src/main/java/org/bukkit/conversations/BooleanPrompt.java
@@ -14,12 +14,13 @@ public abstract class BooleanPrompt extends ValidatingPrompt{
@@ -15,12 +15,13 @@ public abstract class BooleanPrompt extends ValidatingPrompt{
@Override
protected boolean isInputValid(ConversationContext context, String input) {
@@ -24,5 +24,5 @@ index 6abb354..a51e754 100644
}
--
1.8.1.2
1.8.3.2

8
Bukkit-Patches/0017-Add-Getter-for-Entity-Invulnerability.patch
View File

@@ -1,14 +1,14 @@
From 2b0c15a4f33f6f6f08f59c0245675a45a83ac572 Mon Sep 17 00:00:00 2001
From a8a099f5f2035ace89be9d9b7dfe4cc7c470a629 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:49:36 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 72af4fa..a5b2100 100644
index 396ea20..294e80b 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -280,4 +280,22 @@ public interface Entity extends Metadatable {
@@ -291,4 +291,22 @@ public interface Entity extends Metadatable {
* @return The current vehicle.
*/
public Entity getVehicle();
@@ -32,5 +32,5 @@ index 72af4fa..a5b2100 100644
+ // Spigot End
}
--
1.8.1.2
1.8.3.2

8
Bukkit-Patches/0018-Add-respawn-API.patch
View File

@@ -1,14 +1,14 @@
From 7e6fa10b69f0c1aedc0835a504135986d96d3092 Mon Sep 17 00:00:00 2001
From a693df4f53bb8e5c86a9dc5e67f4387838d266b3 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:35:58 +0200
Subject: [PATCH] Add respawn API.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9ee8f5f..8fd9a07 100644
index ba0ce2b..15481e7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -762,6 +762,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -829,6 +829,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@@ -24,5 +24,5 @@ index 9ee8f5f..8fd9a07 100644
Spigot spigot();
--
1.8.1.2
1.8.3.2

6
Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch
View File

@@ -1,14 +1,14 @@
From 47c6643184e01fc22dc9eecbca2aec48e2900616 Mon Sep 17 00:00:00 2001
From b3235471bc185d87ea76910a169501977ec9c578 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:19:50 +1100
Subject: [PATCH] Allow for fallback commands to be removed.
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index f716782..cb0707f 100644
index c2f488a..9283b23 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -326,4 +326,18 @@ public class SimpleCommandMap implements CommandMap {
@@ -330,4 +330,18 @@ public class SimpleCommandMap implements CommandMap {
}
}
}