Remove Moonrise utils to MCUtils, remove duplicated/unused utils

1 files changed, 23 insertions, 0 deletions

diff --git a/patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch
new file mode 100644
index 0000000000..ddac15d311
--- /dev/null
+++ b/patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Fri, 19 Jan 2018 08:15:29 -0600
+Subject: [PATCH] Add PlayerAdvancementCriterionGrantEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
+index 81bef7427478fe911e81f024102654d8d540dbb7..4c85abf29441645039b6a554a50e1d3274229de6 100644
+--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
++++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
+@@ -225,6 +225,12 @@ public class PlayerAdvancements {
+         boolean flag1 = advancementprogress.isDone();
+ 
+         if (advancementprogress.grantProgress(criterionName)) {
++            // Paper start - Add PlayerAdvancementCriterionGrantEvent
++            if (!new com.destroystokyo.paper.event.player.PlayerAdvancementCriterionGrantEvent(this.player.getBukkitEntity(), advancement.toBukkit(), criterionName).callEvent()) {
++                advancementprogress.revokeProgress(criterionName);
++                return false;
++            }
++            // Paper end - Add PlayerAdvancementCriterionGrantEvent
+             this.unregisterListeners(advancement);
+             this.progressChanged.add(advancement);
+             flag = true;