Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix patches, add cooldown to PlayerShieldDisableEvent

Browse Source
This commit is contained in:
Cryptite
2022-05-12 08:02:08 -05:00
parent dd0cf087a7
commit 34e46f1f2e
6 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/api/0001-Add-PlayerShieldDisableEvent.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Add PlayerShieldDisableEvent
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerShieldDisableEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerShieldDisableEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..f0f3a57a0ce76b4736219c6ece52b8bc47a7a4ec
index 0000000000000000000000000000000000000000..d4bda54582228377c902e4743168e084e1bf8b2d
--- /dev/null
+++ b/src/main/java/io/papermc/paper/event/player/PlayerShieldDisableEvent.java
@@ -0,0 +1,50 @@
@@ -0,0 +1,60 @@
+package io.papermc.paper.event.player;
+
+import org.bukkit.entity.Entity;
@@ -27,11 +27,13 @@ index 0000000000000000000000000000000000000000..f0f3a57a0ce76b4736219c6ece52b8bc
+public class PlayerShieldDisableEvent extends PlayerEvent implements Cancellable {
+ private static final HandlerList handlers = new HandlerList();
+ private final Entity damager;
+ private int cooldown;
+ private boolean cancelled = false;
+
+ public PlayerShieldDisableEvent(@NotNull final Player player, @Nullable final Entity damager) {
+ public PlayerShieldDisableEvent(@NotNull final Player player, @Nullable final Entity damager, int cooldown) {
+ super(player);
+ this.damager = damager;
+ this.cooldown = cooldown;
+ }
+
+ @Nullable
@@ -39,6 +41,14 @@ index 0000000000000000000000000000000000000000..f0f3a57a0ce76b4736219c6ece52b8bc
+ return damager;
+ }
+
+ public int getCooldown() {
+ return cooldown;
+ }
+
+ public void setCooldown(int cooldown) {
+ this.cooldown = cooldown;
+ }
+
+ @NotNull
+ @Override
+ public HandlerList getHandlers() {

4
patches/api/0006-World-Instance-flag.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] World Instance flag
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ba57e09e66b044fb3a99acde8e0a851e3d125d01..b5e21537f803816ee6112ea9368750237835538c 100644
index 340f3e569a411e7603fba8d38b79446da0ab4a93..dbb8718e7e62135dc05315be3db01d1a037c1f78 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2609,6 +2609,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2600,6 +2600,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
*/
public void setAutoSave(boolean value);