From ce8fc1df49b8c30a76c9919327b270842fb8ee62 Mon Sep 17 00:00:00 2001 From: wolf Date: Sun, 16 Mar 2025 12:14:44 -0500 Subject: [PATCH] Break & Place --- .gradle/8.5/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/8.5/checksums/md5-checksums.bin | Bin 40947 -> 37947 bytes .gradle/8.5/checksums/sha1-checksums.bin | Bin 183182 -> 162557 bytes .../data/types/CommandBlockHolder.java | 3 ++- .../blocks/command/CommandBlockBreak.java | 11 ++++++----- .../blocks/command/CommandBlockPlace.java | 6 +++--- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gradle/8.5/checksums/checksums.lock b/.gradle/8.5/checksums/checksums.lock index 2c1b8cccadce4ffe23e20ce00e3bdd5b2b86f6ee..a5d19998c6c0c68b7140b78e56bd264ba4e5350d 100644 GIT binary patch literal 17 VcmZSfyWC&;{v_{G1~A}u0RTC~1mXYy literal 17 VcmZSfyWC&;{v_{G1~A|W0suMG1n~d> diff --git a/.gradle/8.5/checksums/md5-checksums.bin b/.gradle/8.5/checksums/md5-checksums.bin index 98a8e56fb7f0b1d2d2f7edc36000d9a2d80e1012..13a4e1f326811eece109f3e655dc4c8a924f95f2 100644 GIT binary patch delta 854 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 diff --git a/.gradle/8.5/checksums/sha1-checksums.bin b/.gradle/8.5/checksums/sha1-checksums.bin index 0daf1fd7948608763ee03d9fed6f1c36ff2416ad..8b2632346e5c1936f136fca0e76cd64f1ff41421 100644 GIT binary patch delta 3703 zcmZ8idt8p^8+YB6O6+;l=&h!NPENgHX&cIKMi@EFHfvLj!WbQ-12bVcB+0$HG}A#; z4zaxH*@*ICB$B3*L&z$Uq#PUZyWZ!1_xtU$_mAiEe6Q7x6w=(D`cdOCNv@zy5WI5S?|Mn@?dSu1v~vJ2aNf%2xTyISmm0ompoX6r z=*k@iMM*rk?-zghCyJouv$aWs+!(((#9KRND0MW)Rl~Dfi?9IMq_^^nVyb@Hu4lf) zXUNXsmF-N8#wpBOo}a>;8D{Tb8f@LcYNWVL))U9w`byB3h2g`WSqi4@WLwcMl|^D} zDh1l5F*Pq387YnXsA@YqG*Xb4JjWAhY&Ea)XpYb0Jun@2>;Vm0WPwJSbEIFTdHe_ww(JzH$s)Hw zHhui-Y`CNK^!8e8Wl+54u-|lzy_ZPR`>|lF2lHR@KY-bJ_Ae~+G{u&DbG-=^^W1tX zezRV~9UHtQ+X%lU)0h57;j_p(9@vn=dpG9r>c*?uvv+NQciwB0OlA%WIAB~XNKux& zp(%#1x?jvcZ7$|RA852&9+-gkV2i|5Jzrms*pq+fZ9!e$pC4(pmz<&;B7FNS61I>d z+OpOP&|Ylw0ImDudyG$gmcXAri&WWG-8Ivsr+@#Hej(_uR zu!}y@H7O7lO1@sn$NKCr6t?9FNwtuISwIv2GOKC)AZNY4Lz=M+phJpIGzqM2i4*K) z#(128y;L;xqf4C|#p+maHdZmp5ou1;?H=Is%e1wGVW&NYCIAf0)&`&{TOPhnkJ zjzf${SF4O@)n|-Ib^|mfj*VJZ$S+@N)RbU#AeS})2c5iaz7?XG`TU?HxBxJK&6O@PQ<4Y zl&Hqti_Uz0XXHD=8e)M*RIsV*K=Ur3&O}~Gjn-FEqvNWms>&*GMVo4ZE2`=2+|a#^ zxGj$A65kL>8q{zo9`{<4Z-k);rKA(dJ3<_K#COAcZ!Q`uXtfx z{yToN2KwTzHDD!QUIWH}?Q3ac+I7%|g+IUq*(R2DDbHLFt3kRLy4-u-AHVBA;)ZuN zK%Kq;7O1KY-+R>mF54rl%l69Fo4_3K!#LQA&2f;eswpYINEc};wdhOk`X)gQnTXbDH0D3kAOSa}LxAo&RZHjFW^D*wKTTg<4ED@`4&C)y zgBF=o{j2u37iDhiV=Md-^KnKd4Sm1I`o?*;gY-d@@lGb)h?93iHg?+sC-Kic)SGV> zTv2s-)N^9h?bggr9&;ER!O)}Wj30&obHfxZj3ihRfvH-s z#)n#%O7NUFdga3;NS8D7;XS}7M`#2)3P|^_3h3WsunZG0PKHDr@he2&sb3*Vnznn` zX~T|4QFrKPIQ%yn%ebT9D#slKQ@{hqXdn57H1y5Kp;&TS-(362;u1k$Hd_Ahgl;M8 zib&r1Mc@IF!@cZxUopC`QxzCb;Ec>!`H?Qe%GCA)0F376%U7r=_) z;Bxw}EG#GHJC`6*K79$&8LqrcRezQ}>SkwLzTk&;;P6VA!=l#y@2;rPT@#TwuNwSi zx*vx%@7C zsoV600qEKU!|3h&pV-os*xxrPOTMrOE1F<|j17~M=L zqT@cOb-V`b)eM#NcF_=9nw6wwl^D}Z%5iN5OQR$TNyDNw6tedLwXx}elJMeW^fXlx zUW`Sz7GmGhc?Y+^Rb8%5tTUyrzyDAnmybZtheSzu2C{yBkrPhhwW3vz9%_G7kqd3u3ltmQ2IT4PwPz z$=}4~kZ;+KfFEm>?!=MMwf&FNp!6h;gEf9&z|`Go>P%T)7q3`MoX;$HaAt2^=jUEw zodZ?+MZTCssSy?}AgpcBTmEcUQ=u2K&x>B)T1n8=tng!b5BX^)4F2b0u%09$6t+Do=h!Yag z%|OUT5sQ*hsKrg!sF2Grn#6?$F^O?LSn&ib@U}6tq}YE8NRg6W7sd~i`h{$ibV5st zVsx$iTP%W8ggaY6yee|hrTm9dloEwh6jFH>*6CDZYNpKgQa|+ZC+Mk%pX13`nr*lq zZpB11f+Qy;PlXA#Jtnqqv>w}F;v>RlPn6Ot24h+q!L-K$y5TV$drBKv_Mquhj8$f0 z*m(<6%-BGxvtkBz>f&3wE5%eK;#W@y`aBi!N6@TYv{rE($F`HFvxh?bqZ2cpf^N>2 z`zbm5_nC(_OO%`qBhY@Svckrb7!%5-VcfS$P!mT|wKdN7Qeg7{oI-~Hcj}=y6KEX9 T+_8L#LTQP|T3y7=66XA0^M8l> delta 14220 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 MAhf0Xir2yYKZFao&Hw-a diff --git a/src/main/java/me/trouper/sentinel/data/types/CommandBlockHolder.java b/src/main/java/me/trouper/sentinel/data/types/CommandBlockHolder.java index eb3cfad..878db3c 100644 --- a/src/main/java/me/trouper/sentinel/data/types/CommandBlockHolder.java +++ b/src/main/java/me/trouper/sentinel/data/types/CommandBlockHolder.java @@ -117,7 +117,7 @@ public class CommandBlockHolder { public CommandBlockHolder addAndWhitelist() { return setWhitelisted(true).add(); } - + public BlockFace getDirection() { try { return BlockFace.valueOf(facing.toUpperCase()); @@ -193,6 +193,7 @@ public class CommandBlockHolder { } public void delete() { + SerialLocation.translate(this.loc).getBlock().setType(Material.AIR); Sentinel.getInstance().getDirector().io.commandBlocks.holders.removeIf(h->h.loc.isSameLocation(this.loc)); Sentinel.getInstance().getDirector().io.commandBlocks.save(); } diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockBreak.java b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockBreak.java index a709f23..2c8ed79 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockBreak.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockBreak.java @@ -28,8 +28,6 @@ public class CommandBlockBreak extends AbstractViolation{ @EventHandler public void onBreak(BlockBreakEvent e) { - //ServerUtils.verbose("CommandBlockBreak: Detected the event"); - //ServerUtils.verbose("CommandBlockBreak: Changer is a player"); Block b = e.getBlock(); if (!(ServerUtils.isCommandBlock(b))) return; ServerUtils.verbose("CommandBlockBreak: Block is a command block"); @@ -38,13 +36,16 @@ public class CommandBlockBreak extends AbstractViolation{ CommandBlockHolder holder = Sentinel.getInstance().getDirector().whitelistManager.generateHolder(p.getUniqueId(),cb); if (PlayerUtils.isTrusted(e.getPlayer())) { if (!Sentinel.getInstance().getDirector().whitelistManager.autoWhitelist.contains(p.getUniqueId())) { - - return; + holder.setWhitelisted(false); + holder.delete(); } return; } - if (!Sentinel.getInstance().getDirector().io.violationConfig.commandBlockBreak.enabled) return; + if (!Sentinel.getInstance().getDirector().io.violationConfig.commandBlockBreak.enabled) { + holder.delete(); + return; + } ServerUtils.verbose("CommandBlockBreak: is enabled, performing action"); diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockPlace.java b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockPlace.java index 8df9457..fbfe367 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockPlace.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/blocks/command/CommandBlockPlace.java @@ -33,13 +33,13 @@ public class CommandBlockPlace extends AbstractViolation { CommandBlock cb = (CommandBlock) b.getState(); CommandBlockHolder holder = Sentinel.getInstance().getDirector().whitelistManager.generateHolder(p.getUniqueId(),cb); if (PlayerUtils.isTrusted(p)) { - holder.addToExisting(); - if (Sentinel.getInstance().getDirector().whitelistManager.autoWhitelist.contains(p.getUniqueId())) holder.addToWhitelist(); + if (Sentinel.getInstance().getDirector().whitelistManager.autoWhitelist.contains(p.getUniqueId())) holder.addAndWhitelist(); + holder.add(); return; } if (!Sentinel.getInstance().getDirector().io.violationConfig.commandBlockPlace.enabled) { - holder.addToExisting(); + holder.add(); return; }