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

Merge some stuff from upstream.

Browse source
This commit is contained in:
md_5 2014-04-02 17:54:35 +11:00
parent a562fecb4b
commit 04d72bc702
14 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 8bba02b152cd01cec04b8d95b96dbc3c357760ea Mon Sep 17 00:00:00 2001
From 1cc16373af997e6e986bf481fb714bf991859bc4 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 da574e0..b045cb9 100644
index 4c19370..1d71ff7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1252,4 +1252,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1253,4 +1253,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
collection.add(new AttributeModifiable(getHandle().bb(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
}
@ -84,5 +84,5 @@ index da574e0..b045cb9 100644
+ // Spigot end
}
--
1.8.5.2.msysgit.0
1.8.3.2