From e7cb4cfb80b926b41579a149eb21c2e309f158a7 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Mon, 1 Jul 2024 15:46:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eop=E4=B8=8E=E5=88=9B=E9=80=A0?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E5=8F=AF=E4=BB=A5=E6=97=A0=E6=8D=9F=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8lwe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 2 +-
 src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java | 9 ++++-----
 src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java  | 9 ++++-----
 src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java | 9 ++++-----
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 32be5e5..8a0995f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>LiteWorldEdit</artifactId>
-    <version>2.4.3.5</version>
+    <version>2.4.3.6</version>
     <packaging>jar</packaging>
 
     <name>LiteWorldEdit</name>
diff --git a/src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java
index 3e13d5f..5fb6cd5 100644
--- a/src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java
+++ b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Absorb.java
@@ -1,10 +1,7 @@
 package cn.lunadeer.liteworldedit.Jobs;
 
 import cn.lunadeer.liteworldedit.LoggerX;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockPlaceEvent;
@@ -54,7 +51,9 @@ public class Absorb extends Job {
             raw_block.setType(Material.SPONGE);
             raw_block.setType(Material.AIR);
             // 损坏镐
-            useNetherPickaxe(pickaxe);
+            if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) {
+                useNetherPickaxe(pickaxe);
+            }
             return JobErrCode.OK;
         } else {
             return JobErrCode.NO_PERMISSION;
diff --git a/src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java
index 25e582b..5a5027a 100644
--- a/src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java
+++ b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Place.java
@@ -1,10 +1,7 @@
 package cn.lunadeer.liteworldedit.Jobs;
 
 import cn.lunadeer.liteworldedit.LoggerX;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.ShulkerBox;
 import org.bukkit.entity.Player;
@@ -75,7 +72,9 @@ public class Place extends Job {
         Bukkit.getPluginManager().callEvent(event);
         if (!event.isCancelled()) {
             raw_block.setType(_block);
-            stack.setAmount(stack.getAmount() - 1);
+            if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) {
+                stack.setAmount(stack.getAmount() - 1);
+            }
             return JobErrCode.OK;
         } else {
             return JobErrCode.NO_PERMISSION;
diff --git a/src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java
index 933774a..5b193ad 100644
--- a/src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java
+++ b/src/main/java/cn/lunadeer/liteworldedit/Jobs/Remove.java
@@ -2,10 +2,7 @@ package cn.lunadeer.liteworldedit.Jobs;
 
 import cn.lunadeer.liteworldedit.LiteWorldEdit;
 import cn.lunadeer.liteworldedit.LoggerX;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockBreakEvent;
@@ -53,7 +50,9 @@ public class Remove extends Job {
                 raw_block.getWorld().dropItemNaturally(raw_block.getLocation(), new ItemStack(raw_block.getType()));
             }
             // 损坏镐
-            useNetherPickaxe(pickaxe);
+            if (!_creator.isOp() && _creator.getGameMode() != GameMode.CREATIVE) {
+                useNetherPickaxe(pickaxe);
+            }
             return JobErrCode.OK;
         } else {
             return JobErrCode.NO_PERMISSION;