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

Patch rebuild

This commit is contained in:
md_5 2016-03-01 11:27:36 +11:00 committed by Zach Brown
parent 907e323aa6
commit c33773ec93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch
View File

@ -1,11 +1,11 @@
From e9abdb9e15800ccb98b33b114206deb72751d948 Mon Sep 17 00:00:00 2001 From 0bbc7f4798cc4ff7c9329671144e8c4081650185 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org> From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 26 Jun 2014 23:42:52 +0100 Date: Thu, 26 Jun 2014 23:42:52 +0100
Subject: [PATCH] Add damager to the unhandled error Subject: [PATCH] Add damager to the unhandled error
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 86820c2..a10ced5 100644 index abeab03..beee3a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -170,7 +170,7 @@ public class CraftEventFactory { @@ -170,7 +170,7 @@ public class CraftEventFactory {
@ -18,7 +18,7 @@ index 86820c2..a10ced5 100644
return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack); return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack);
} }
@@ -468,7 +468,7 @@ public class CraftEventFactory { @@ -468,7 +468,7 @@ public class CraftEventFactory {
if (source == DamageSource.CACTUS) { if (source == DamageSource.CACTUS || source == DamageSource.j) { // PAIL: rename
cause = DamageCause.CONTACT; cause = DamageCause.CONTACT;
} else { } else {
- throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex)); - throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex));