Remove KeyedObject interface (#7680)

2022-03-30 13:28:38 -07:00 · 2022-03-30 13:28:38 -07:00 · 7f47b9b7f8
commit 7f47b9b7f8
parent d3c102373f
877 changed files with 270 additions and 394 deletions
--- a/patches/server/0171-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/server/0171-PlayerAdvancementCriterionGrantEvent.patch
@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Fri, 19 Jan 2018 08:15:29 -0600
+Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
+index e5ffc18cbd107b9fd20a9781f6f1979e9598378f..ecd62d2625bc5def3ac68f642f2c6f156060f129 100644
+--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
+@@ -277,6 +277,12 @@ public class PlayerAdvancements {
+         boolean flag1 = advancementprogress.isDone();
+ 
+         if (advancementprogress.grantProgress(criterionName)) {
+            // Paper start
+            if (!new com.destroystokyo.paper.event.player.PlayerAdvancementCriterionGrantEvent(this.player.getBukkitEntity(), advancement.bukkit, criterionName).callEvent()) {
+                advancementprogress.revokeProgress(criterionName);
+                return false;
+            }
+            // Paper end
+             this.unregisterListeners(advancement);
+             this.progressChanged.add(advancement);
+             flag = true;