Should probably do an upstream update.

This commit is contained in:
md_5 2013-07-24 19:29:30 +10:00
parent 32eb618d1c
commit 5d31ee288a
15 changed files with 55 additions and 63 deletions

View file

@ -1,4 +1,4 @@
From 3d9160caf85e0157802ddbbc5ccc519387eccd3e Mon Sep 17 00:00:00 2001
From 625173b0a71830d89ebbef0f8c23dd0dae985b57 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -43,12 +43,12 @@ index b46b9c4..c91b12c 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 977adff..5628d84 100644
index fd73856..25deaa9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1010,4 +1010,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isScaledHealth() {
return this.scaledHealth;
@@ -1065,4 +1065,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
collection.add(new AttributeModifiable(getHandle().aW(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
}
+
+ // Spigot start