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

Should probably do an upstream update.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-24 19:29:30 +10:00
parent 75ed907450
commit caa031dbae
15 changed files with 55 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,25 +1,17 @@
From 6529e4d6c6a0b3a11775299d9838a46ee16c92a8 Mon Sep 17 00:00:00 2001
From b1bf254e16c2dc76aaf59033d7e1645a6bc19ccf 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 5c5d526..724f601 100644
index 3b58d12..0519c55 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -647,7 +647,6 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* yet or has logged out
@@ -691,4 +691,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @see Player#setHealthScaled(boolean)
*/
public void setScoreboard(Scoreboard scoreboard) throws IllegalArgumentException, IllegalStateException;
-
/**
* Gets if the client is displayed a 'scaled' health, that is, health on a
* scale from 0-20.
@@ -667,4 +666,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @param scale if the client health display is scaled
*/
public void setScaleHealth(boolean scale);
public double getHealthScale();
+
+ // Spigot start
+ public class Spigot

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

@@ -1,4 +1,4 @@
From b08b4b61746b4a26079cc40f2d4b991e56f6f0a7 Mon Sep 17 00:00:00 2001
From 8a68a3ace4aac7d385184dbd10b33140dcc8be60 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
@@ -320,10 +320,10 @@ index e14fe40..9ae9b2d 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 724f601..376ceef 100644
index 0519c55..d602594 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -681,6 +681,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -706,6 +706,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}