@@ -28,6 +28,8 @@ public void onPlayerQuickLockChest(PlayerInteractEvent event){
2828 if (event .isCancelled ()) return ;
2929 // Check quick lock enabled
3030 if (Config .getQuickProtectAction () == (byte )0 ) return ;
31+ // Check world enabled
32+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
3133 // Get player and action info
3234 Action action = event .getAction ();
3335 Player player = event .getPlayer ();
@@ -97,6 +99,7 @@ public void onPlayerQuickLockChest(PlayerInteractEvent event){
9799 @ EventHandler (priority = EventPriority .NORMAL )
98100 public void onManualLock (SignChangeEvent event ){
99101 if (event .getBlock ().getType () != Material .WALL_SIGN ) return ;
102+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
100103 String topline = event .getLine (0 );
101104 Player player = event .getPlayer ();
102105 /* Issue #46 - Old version of Minecraft trim signs in unexpected way.
@@ -167,6 +170,7 @@ public void onManualLock(SignChangeEvent event){
167170 // Player select sign
168171 @ EventHandler (priority = EventPriority .LOW )
169172 public void playerSelectSign (PlayerInteractEvent event ){
173+ if (event .getPlayer () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
170174 if (event .getAction () == Action .RIGHT_CLICK_BLOCK && event .getClickedBlock ().getType () == Material .WALL_SIGN ){
171175 Block block = event .getClickedBlock ();
172176 Player player = event .getPlayer ();
@@ -183,6 +187,7 @@ public void playerSelectSign(PlayerInteractEvent event){
183187 @ EventHandler (priority = EventPriority .HIGH )
184188 public void onAttemptBreakSign (BlockBreakEvent event ){
185189 if (event .isCancelled ()) return ;
190+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
186191 Block block = event .getBlock ();
187192 Player player = event .getPlayer ();
188193 if (player .hasPermission ("lockettepro.admin.break" )) return ;
@@ -217,6 +222,7 @@ public void onAttemptBreakSign(BlockBreakEvent event){
217222 @ EventHandler (priority = EventPriority .HIGH )
218223 public void onAttemptBreakLockedBlocks (BlockBreakEvent event ){
219224 if (event .isCancelled ()) return ;
225+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
220226 Block block = event .getBlock ();
221227 Player player = event .getPlayer ();
222228 if (LocketteProAPI .isLocked (block ) || LocketteProAPI .isUpDownLockedDoor (block )){
@@ -229,6 +235,7 @@ public void onAttemptBreakLockedBlocks(BlockBreakEvent event){
229235 // Protect block from being used & handle double doors
230236 @ EventHandler (priority = EventPriority .HIGH )
231237 public void onAttemptInteractLockedBlocks (PlayerInteractEvent event ){
238+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
232239 Action action = event .getAction ();
233240 Block block = event .getClickedBlock ();
234241 if (LockettePro .needCheckHand ()){
@@ -288,6 +295,7 @@ public void onAttemptInteractLockedBlocks(PlayerInteractEvent event){
288295 @ EventHandler (priority = EventPriority .HIGH )
289296 public void onAttemptPlaceInterfereBlocks (BlockPlaceEvent event ){
290297 if (event .isCancelled ()) return ;
298+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
291299 Block block = event .getBlock ();
292300 Player player = event .getPlayer ();
293301 if (player .hasPermission ("lockettepro.admin.interfere" )) return ;
@@ -302,6 +310,7 @@ public void onAttemptPlaceInterfereBlocks(BlockPlaceEvent event){
302310 @ EventHandler (priority = EventPriority .MONITOR )
303311 public void onPlaceFirstBlockNotify (BlockPlaceEvent event ){
304312 if (event .isCancelled ()) return ;
313+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
305314 Block block = event .getBlock ();
306315 Player player = event .getPlayer ();
307316 if (!player .hasPermission ("lockettepro.lock" )) return ;
0 commit comments