Upstream merge.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-08 08:36:30 +10:00
parent e7e8fa87a5
commit aecf382223
25 changed files with 69 additions and 109 deletions

View File

@@ -1,14 +1,14 @@
From d4a9dfb80cd5f9f6a45bd291e8297a749f665b2c Mon Sep 17 00:00:00 2001
From 90e7f1b07d3998ff3eabc59edb00fe2993b02eb8 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 ab022b5..39d3800 100644
index 3ec374b..cc9c3b2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -709,4 +709,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -721,4 +721,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @see Player#setHealthScaled(boolean)
*/
public double getHealthScale();