Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream CB/S

Browse Source
This commit is contained in:
Zach Brown 2018-01-05 00:46:00 -06:00
parent ef505a9a32
commit 03ce426ddf
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index f641c6dc1..1eafdecb4 100644
index 7bf45f7d0..b9e106031 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

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

@ -5,7 +5,7 @@ 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
index e2083fb29..f641c6dc1 100644
index 425919cda..7bf45f7d0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit dc7d31b00d121c486660fafc9d6b4eb38e9db76d
Subproject commit ab09b27ef4e725ce47c64390166987aefe58fa72

2
work/Spigot

@ -1 +1 @@
Subproject commit 325fbc7f164aeab1f169e47374a9bdd0d67cc8ba
Subproject commit 109b080674813aa448e58f1f0106f121ec500614