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

Merge in some stuff

Browse source
This commit is contained in:
md_5 2013-12-14 17:58:22 +11:00
parent 20b8330a25
commit 7899e58d02
14 changed files with 54 additions and 54 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 43a4368814bb1162e0cc30b58ba911b3d6099646 Mon Sep 17 00:00:00 2001
From 95f2e5161b4c710aa311b89876e3d5d341768f26 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 0153608..9add7bf 100644
index 48c5ae9..9f09b84 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1125,4 +1125,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1126,4 +1126,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)));
}