From fba8333de3093d034b1a4bba06003ab051b33e6d Mon Sep 17 00:00:00 2001 From: Joo200 Date: Wed, 21 Jun 2023 22:20:42 +0200 Subject: [PATCH 1/5] Fix backwards compatibility with 1.19.4 --- .../main/java/com/sk89q/worldguard/bukkit/util/Materials.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java index d2574d29..1f87de9a 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java @@ -53,9 +53,10 @@ public final class Materials { private static final Set DAMAGE_EFFECTS = new HashSet<>(); private static void putMaterialTag(Tag tag, Integer value) { + if (tag == null) return; tag.getValues().forEach(mat -> MATERIAL_FLAGS.put(mat, value)); } - private static Tag SIGNS_TAG; + private static Tag SIGNS_TAG = Tag.SIGNS; static { ENTITY_ITEMS.put(EntityType.PAINTING, Material.PAINTING); From 58fbb6f008cb3242807131d4ee58ccff95e28cb0 Mon Sep 17 00:00:00 2001 From: Joo200 Date: Sun, 30 Jul 2023 18:20:02 +0200 Subject: [PATCH 2/5] Remove Support for 1.19 --- CHANGELOG.md | 2 +- worldguard-bukkit/src/main/resources/plugin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e51c37..dd0cd56c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## 7.0.9 -* Add support for MC 1.20 +* Add support for MC 1.20, drop support for MC 1.19 * Made entities spawned via the `/summon` command get treated as plugin-spawned entities * Add sniffer egg trample protection options diff --git a/worldguard-bukkit/src/main/resources/plugin.yml b/worldguard-bukkit/src/main/resources/plugin.yml index 7664ad21..223be72f 100644 --- a/worldguard-bukkit/src/main/resources/plugin.yml +++ b/worldguard-bukkit/src/main/resources/plugin.yml @@ -3,4 +3,4 @@ main: com.sk89q.worldguard.bukkit.WorldGuardPlugin version: "${internalVersion}" depend: [WorldEdit] softdepend: [CommandBook] -api-version: 1.19 +api-version: "1.20" From 5934e49489e01f2ea0363e6e9322c2f17f042445 Mon Sep 17 00:00:00 2001 From: Joo200 Date: Sun, 30 Jul 2023 18:34:12 +0200 Subject: [PATCH 3/5] Fix changed event for copper-fade flag --- .../listener/WorldGuardBlockListener.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java index fbba75fd..ad8e11c6 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java @@ -470,7 +470,6 @@ public class WorldGuardBlockListener extends AbstractListener { public void onBlockForm(BlockFormEvent event) { ConfigurationManager cfg = getConfig(); - if (cfg.activityHaltToggle) { event.setCancelled(true); return; @@ -521,6 +520,18 @@ public class WorldGuardBlockListener extends AbstractListener { return; } } + + if (Materials.isUnwaxedCopper(event.getBlock().getType())) { + if (wcfg.disableCopperBlockFade) { + event.setCancelled(true); + return; + } + if (wcfg.useRegions && !StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery() + .queryState(BukkitAdapter.adapt(event.getBlock().getLocation()), (RegionAssociable) null, Flags.COPPER_FADE))) { + event.setCancelled(true); + return; + } + } } /* @@ -697,16 +708,6 @@ public class WorldGuardBlockListener extends AbstractListener { event.setCancelled(true); return; } - } else if (Materials.isUnwaxedCopper(event.getBlock().getType())) { - if (wcfg.disableCopperBlockFade) { - event.setCancelled(true); - return; - } - if (wcfg.useRegions && !StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery() - .queryState(BukkitAdapter.adapt(event.getBlock().getLocation()), (RegionAssociable) null, Flags.COPPER_FADE))) { - event.setCancelled(true); - return; - } } } From 16a3c8500588fe6349bb1dd828de7558a0093bc3 Mon Sep 17 00:00:00 2001 From: wizjany Date: Mon, 31 Jul 2023 20:11:06 -0400 Subject: [PATCH 4/5] Release 7.0.9. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d8098a54..bc8a7e60 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=com.sk89q.worldguard -version=7.0.9-SNAPSHOT +version=7.0.9 From 3201cee1b703f472200eaf86a4f50cb19b1148b1 Mon Sep 17 00:00:00 2001 From: wizjany Date: Mon, 31 Jul 2023 20:12:56 -0400 Subject: [PATCH 5/5] Bump to snapshot. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bc8a7e60..4a297c65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=com.sk89q.worldguard -version=7.0.9 +version=7.0.10-SNAPSHOT