core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update against latest upstream versions

This commit is contained in:
Zach Brown 2016-03-03 23:50:05 -06:00
parent f760b7f0ed
commit 7e7db629ed
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit fccf27b47d27d5bece10ccfc21770adfe89e26de Subproject commit 7d83cba0f2575112577ed7a091ed8a193bfc261a

2
CraftBukkit

@ -1 +1 @@
Subproject commit 31caee5a947d439f886602469c855ed56c5a1c48 Subproject commit ef13ca4444c53ec5fd844ab078c7dcbf0e1f0bbe

6
Spigot-Server-Patches/0068-Be-a-bit-more-informative-in-maxHealth-exception.patch
View File

@ -1,14 +1,14 @@
From 4034b13cc0e4afe7c20fc0a85428978d4bccba8c Mon Sep 17 00:00:00 2001 From 3551594da49109bd71a1b0905276ad2adf38f443 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:18:39 -0600 Date: Thu, 3 Mar 2016 02:18:39 -0600
Subject: [PATCH] Be a bit more informative in maxHealth exception Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 0c234c7..c9a7091 100644 index e8aff90..ebf378b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -84,7 +84,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -85,7 +85,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setHealth(double health) { public void setHealth(double health) {
if ((health < 0) || (health > getMaxHealth())) { if ((health < 0) || (health > getMaxHealth())) {