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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-03 21:12:44 +01:00
parent b07d19630a
commit fbf54955d5
25 changed files with 100 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From 7cc271bc52e3e97fecb2d288d925f9b7777e380d Mon Sep 17 00:00:00 2001
From 8e9bba3a806a6d5d2304117410300b74d30b436d 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 44c9b5a..21f348b 100644
index fe8a0bd..e851b98 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1018,4 +1018,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1035,4 +1035,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @see Player#setHealthScaled(boolean)
*/
public double getHealthScale();

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

@@ -1,4 +1,4 @@
From 0d3d7850cc74fecc1cddc555e26103f2d44c7b01 Mon Sep 17 00:00:00 2001
From d62993211f88621e18c42f081425815346e4495e 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
@@ -327,10 +327,10 @@ index 9bf2c41..6cf3ff0 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 21f348b..a2ac7a6 100644
index e851b98..c6bb787 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1033,6 +1033,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1050,6 +1050,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@@ -360,5 +360,5 @@ index 08aa71d..5217aec 100644
}
}
--
1.8.3.2
1.8.5.2.msysgit.0

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

@@ -1,14 +1,14 @@
From 240fc02a1e8cc6aa73258b81e2721b03328ad450 Mon Sep 17 00:00:00 2001
From 07f1e37031ec86f69acce0c4c66deb0d1a978473 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 a2ac7a6..55681ff 100644
index c6bb787..b879ecb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1038,6 +1038,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1055,6 +1055,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@@ -37,5 +37,5 @@ index a2ac7a6..55681ff 100644
Spigot spigot();
--
1.8.3.2
1.8.5.2.msysgit.0

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

@@ -1,14 +1,14 @@
From 69c9fcf3b9cf8b0130d1deda78b36aaded807720 Mon Sep 17 00:00:00 2001
From e97e54dbdcfe6c517061020a5fc377a2249fbd4e 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 55681ff..5a8c13e 100644
index b879ecb..6559243 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1059,6 +1059,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1076,6 +1076,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@@ -24,5 +24,5 @@ index 55681ff..5a8c13e 100644
Spigot spigot();
--
1.8.3.2
1.8.5.2.msysgit.0

8
Bukkit-Patches/0022-Implement-Locale-Getter-for-Players.patch
View File

@@ -1,14 +1,14 @@
From 2994d06fa87fd2535a7b464b7a041e2c5c8e9dab Mon Sep 17 00:00:00 2001
From 57dfad3a6d1085ebc7006402c196285e10e27d6f Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:10:49 +1100
Subject: [PATCH] Implement Locale Getter for Players
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5a8c13e..204c4b2 100644
index 6559243..2cc19a7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1067,6 +1067,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1084,6 +1084,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@@ -26,5 +26,5 @@ index 5a8c13e..204c4b2 100644
Spigot spigot();
--
1.8.3.2
1.8.5.2.msysgit.0

8
Bukkit-Patches/0023-Add-support-for-fetching-hidden-players.patch
View File

@@ -1,14 +1,14 @@
From 4a752151018a3b7fe29c65482b3dff42776c0155 Mon Sep 17 00:00:00 2001
From 267dd31ea425a46cc9c6169944a397dc285f5270 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:02:11 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 204c4b2..6237663 100644
index 2cc19a7..37c8a58 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1077,6 +1077,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1094,6 +1094,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@@ -26,5 +26,5 @@ index 204c4b2..6237663 100644
Spigot spigot();
--
1.8.3.2
1.8.5.2.msysgit.0