Update Upstream WorldGuard

EngineHub@aa46529 Extend use flag to all (trap)doors. EngineHub@70d225e Split chest boat ride/open. EngineHub@2ea5068 Workaround books no longer sending change block for lecterns. EngineHub@b73a0a7 Check mob-damage for potion splashes from e.g. witches. EngineHub@afb619d Fix breeze damage flags EngineHub@9dd7d7c Fix wind-charge-burst flag for player knockback EngineHub@679b569 Split wind charge into breeze/player flags. EngineHub@0f3ea50 Merge pull request EngineHub#2115 from EngineHub/feature/fix-breeze-stuff EngineHub@cb011a8 Add moisture-change flag (EngineHub#1879) (EngineHub#2096) EngineHub@068ad68 Release 7.0.11. EngineHub@fb88d56 Bump to SNAPSHOT for dev.
Euphillya · Sep 12, 2024 · 1aeeb26 · 1aeeb26
1 parent f5d21a0
commit 1aeeb26
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/WorldGuard b/WorldGuard
diff --git a/patches/plugins/0001-Replace-Scheduler-Bukkit-to-Folia.patch b/patches/plugins/0001-Replace-Scheduler-Bukkit-to-Folia.patch
@@ -1,6 +1,6 @@
-From f1f21a85b6e5b3603a61f21b47abeb3b834e302c Mon Sep 17 00:00:00 2001
+From 2547ceef84a1416958e319fa8b62fd4d0f85a4a9 Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
-Date: Thu, 1 Aug 2024 10:53:58 +0200
+Date: Thu, 12 Sep 2024 16:20:06 +0200
 Subject: [PATCH 1/4] Replace Scheduler Bukkit to Folia
 
 ---
@@ -84,10 +84,10 @@ index 86aefb55..c585fa9f 100644
 +
  }
 diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
-index 14c49c2a..1981d3fe 100644
+index 987e8423..2ffed922 100644
 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
 +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
-@@ -997,8 +997,8 @@ public void onInventoryMoveItem(InventoryMoveItemEvent event) {
+@@ -1021,8 +1021,8 @@ public void onInventoryMoveItem(InventoryMoveItemEvent event) {
 
              handleInventoryHolderUse(event, cause, targetHolder);
 

diff --git a/patches/plugins/0002-EntityTeleport-to-EntityTeleportAsync.patch b/patches/plugins/0002-EntityTeleport-to-EntityTeleportAsync.patch
@@ -1,6 +1,6 @@
-From 3973ee8eebaf85f51ad6cb46022352640437ff93 Mon Sep 17 00:00:00 2001
+From ec59e41ee082e117bba08ab9bafb7f742845e31e Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
-Date: Thu, 1 Aug 2024 10:55:50 +0200
+Date: Thu, 12 Sep 2024 16:20:19 +0200
 Subject: [PATCH 2/4] EntityTeleport to EntityTeleportAsync
 
 ---

diff --git a/patches/plugins/0003-Add-Folia-Supported.patch b/patches/plugins/0003-Add-Folia-Supported.patch
@@ -1,6 +1,6 @@
-From 7dcd3cf5a68eeb32691d1a05259b8be7faea7d3e Mon Sep 17 00:00:00 2001
+From 6bb48dc5e609323df03a5bd37705e6400e145df4 Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
-Date: Thu, 1 Aug 2024 10:56:13 +0200
+Date: Thu, 12 Sep 2024 16:20:19 +0200
 Subject: [PATCH 3/4] Add Folia Supported
 
 ---

diff --git a/patches/plugins/0004-Move-canceltask-first.patch b/patches/plugins/0004-Move-canceltask-first.patch
@@ -1,6 +1,6 @@
-From 4113700034ff709eb64d5e6e3bb932925ac08f2b Mon Sep 17 00:00:00 2001
+From 5b8134445a49d9ee9e2a04dcbe4c027167ff022a Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
-Date: Sun, 25 Aug 2024 09:10:47 +0200
+Date: Thu, 12 Sep 2024 16:20:19 +0200
 Subject: [PATCH 4/4] Move canceltask first
 
 ---
+12 −0		CHANGELOG.md
+1 −1		gradle.properties
+2 −0		worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java
+1 −1		worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java
+41 −15		worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
+5 −2		worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
+21 −0		worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java
+18 −33		worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java
+24 −0		worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java
+5 −2		worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
+2 −0		worldguard-core/src/main/java/com/sk89q/worldguard/config/WorldConfiguration.java
+3 −1		worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/Flags.java