mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream merge

Browse source
This commit is contained in:
Thinkofdeath 2014-02-12 13:48:26 +00:00
parent 5aad14d2b6
commit 5284bd1a74
75 changed files with 299 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 8ee072a2329fa1ab8b7540a18c633dd8dee8d549 Mon Sep 17 00:00:00 2001
From ec47c27cbee89a54bc68d4fa7b25b86653034326 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
@ -64,10 +64,10 @@ index fe0f200..e026c1f 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 9935e7a..6b7fcfc 100644
index 60b0435..573f9a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1254,4 +1254,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1252,4 +1252,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
collection.add(new AttributeModifiable(getHandle().bc(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
}