aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAikar <[email protected]>2020-07-22 02:15:51 -0400
committerAikar <[email protected]>2020-07-22 02:15:51 -0400
commitcc25ae47c00513c344d192bb38983b24bcfc367e (patch)
treee0194b5a662093f39b357c8b8f02790bec1b1c9d
parentf503db37c66f5c899ae4560344c2bb13283b6ec7 (diff)
downloadPaper-cc25ae47c00513c344d192bb38983b24bcfc367e.tar.gz
Paper-cc25ae47c00513c344d192bb38983b24bcfc367e.zip
Amend last commit to fix decompile error forgot to commit
-rw-r--r--Spigot-Server-Patches/0548-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch11
1 files changed, 10 insertions, 1 deletions
diff --git a/Spigot-Server-Patches/0548-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0548-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index c8e5157a39..e5620cb419 100644
--- a/Spigot-Server-Patches/0548-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/Spigot-Server-Patches/0548-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
@@ -24,7 +24,7 @@ index d3387a4e16f81b820d40502d2c46ebb3db88f824..17789407b9e86896a963a305a1335728
this.d = datafixer;
this.e = playerlist;
diff --git a/src/main/java/net/minecraft/server/CriterionTriggerAbstract.java b/src/main/java/net/minecraft/server/CriterionTriggerAbstract.java
-index 2419c57f90f40516cb4b4cedcda2c7d58523c3bc..d69ff9ca7a842cea715129f7f38972bed691a625 100644
+index 2419c57f90f40516cb4b4cedcda2c7d58523c3bc..5fd81933f8ba30d165fb3fdf25aaf94917637539 100644
--- a/src/main/java/net/minecraft/server/CriterionTriggerAbstract.java
+++ b/src/main/java/net/minecraft/server/CriterionTriggerAbstract.java
@@ -12,25 +12,25 @@ import java.util.function.Predicate;
@@ -75,3 +75,12 @@ index 2419c57f90f40516cb4b4cedcda2c7d58523c3bc..d69ff9ca7a842cea715129f7f38972be
if (set != null && !set.isEmpty()) {
LootTableInfo loottableinfo = CriterionConditionEntity.b(entityplayer, entityplayer);
+@@ -63,7 +63,7 @@ public abstract class CriterionTriggerAbstract<T extends CriterionInstanceAbstra
+
+ while (iterator.hasNext()) {
+ criteriontrigger_a = (CriterionTrigger.a) iterator.next();
+- T t0 = (CriterionInstanceAbstract) criteriontrigger_a.a();
++ T t0 = (T) criteriontrigger_a.a(); // Paper - decompile fix
+
+ if (t0.b().a(loottableinfo) && predicate.test(t0)) {
+ if (list == null) {