Updated Upstream (Purpur)

Winds-Studio · Jul 30, 2023 · 8659113 · 8659113
1 parent 80409aa
commit 8659113
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 24 deletions.
diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch
@@ -3,7 +3,7 @@ From: Github Actions <no-reply@github.com>
 Date: Fri, 16 Jun 2023 05:21:52 +0000
 Subject: [PATCH] Purpur API Changes
 
-Commit: 5ee0c1b95ce2f8828622bc7b1224de0e672c2bd2
+Commit: a2e96448a0e4688585b5e7dee39caa90bfe48cdb
 
 Patches below are removed in this patch:
 Build-System-Changes.patch
@@ -2834,17 +2834,19 @@ index 0000000000000000000000000000000000000000..519809eab5d926dc7b0a7bad5d446d0d
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java b/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b7db0db7f3afbccdb07390d1bcada109e9e6b30b
+index 0000000000000000000000000000000000000000..32602b398ede24a35ed8a996faa2b23455615a7b
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,54 @@
 +package org.purpurmc.purpur.event;
 +
 +import org.bukkit.block.Block;
++import org.bukkit.block.BlockState;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.block.BlockExplodeEvent;
 +import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
 +import java.util.Collections;
 +
 +/**
@@ -2855,8 +2857,8 @@ index 0000000000000000000000000000000000000000..b7db0db7f3afbccdb07390d1bcada109
 +    private boolean cancelled;
 +    private final float yield;
 +
-+    public PreBlockExplodeEvent(@NotNull final Block what, final float yield) {
-+        super(what, Collections.emptyList(), yield);
++    public PreBlockExplodeEvent(@NotNull final Block what, final float yield, @Nullable BlockState explodedBlockState) {
++        super(what, Collections.emptyList(), yield, explodedBlockState);
 +        this.yield = yield;
 +        this.cancelled = false;
 +    }

diff --git a/patches/server/0009-Purpur-Base.patch b/patches/server/0009-Purpur-Base.patch
@@ -3,7 +3,7 @@ From: Github Actions <no-reply@github.com>
 Date: Wed, 24 May 2023 06:00:03 +0800
 Subject: [PATCH] Purpur Base
 
-Commit: 5ee0c1b95ce2f8828622bc7b1224de0e672c2bd2
+Commit: a2e96448a0e4688585b5e7dee39caa90bfe48cdb
 
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur