@@ -28,6 +28,8 @@ public void onPlayerQuickLockChest(PlayerInteractEvent event){
28
28
if (event .isCancelled ()) return ;
29
29
// Check quick lock enabled
30
30
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 ;
31
33
// Get player and action info
32
34
Action action = event .getAction ();
33
35
Player player = event .getPlayer ();
@@ -97,6 +99,7 @@ public void onPlayerQuickLockChest(PlayerInteractEvent event){
97
99
@ EventHandler (priority = EventPriority .NORMAL )
98
100
public void onManualLock (SignChangeEvent event ){
99
101
if (event .getBlock ().getType () != Material .WALL_SIGN ) return ;
102
+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
100
103
String topline = event .getLine (0 );
101
104
Player player = event .getPlayer ();
102
105
/* Issue #46 - Old version of Minecraft trim signs in unexpected way.
@@ -167,6 +170,7 @@ public void onManualLock(SignChangeEvent event){
167
170
// Player select sign
168
171
@ EventHandler (priority = EventPriority .LOW )
169
172
public void playerSelectSign (PlayerInteractEvent event ){
173
+ if (event .getPlayer () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
170
174
if (event .getAction () == Action .RIGHT_CLICK_BLOCK && event .getClickedBlock ().getType () == Material .WALL_SIGN ){
171
175
Block block = event .getClickedBlock ();
172
176
Player player = event .getPlayer ();
@@ -183,6 +187,7 @@ public void playerSelectSign(PlayerInteractEvent event){
183
187
@ EventHandler (priority = EventPriority .HIGH )
184
188
public void onAttemptBreakSign (BlockBreakEvent event ){
185
189
if (event .isCancelled ()) return ;
190
+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
186
191
Block block = event .getBlock ();
187
192
Player player = event .getPlayer ();
188
193
if (player .hasPermission ("lockettepro.admin.break" )) return ;
@@ -217,6 +222,7 @@ public void onAttemptBreakSign(BlockBreakEvent event){
217
222
@ EventHandler (priority = EventPriority .HIGH )
218
223
public void onAttemptBreakLockedBlocks (BlockBreakEvent event ){
219
224
if (event .isCancelled ()) return ;
225
+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
220
226
Block block = event .getBlock ();
221
227
Player player = event .getPlayer ();
222
228
if (LocketteProAPI .isLocked (block ) || LocketteProAPI .isUpDownLockedDoor (block )){
@@ -229,6 +235,7 @@ public void onAttemptBreakLockedBlocks(BlockBreakEvent event){
229
235
// Protect block from being used & handle double doors
230
236
@ EventHandler (priority = EventPriority .HIGH )
231
237
public void onAttemptInteractLockedBlocks (PlayerInteractEvent event ){
238
+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
232
239
Action action = event .getAction ();
233
240
Block block = event .getClickedBlock ();
234
241
if (LockettePro .needCheckHand ()){
@@ -288,6 +295,7 @@ public void onAttemptInteractLockedBlocks(PlayerInteractEvent event){
288
295
@ EventHandler (priority = EventPriority .HIGH )
289
296
public void onAttemptPlaceInterfereBlocks (BlockPlaceEvent event ){
290
297
if (event .isCancelled ()) return ;
298
+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
291
299
Block block = event .getBlock ();
292
300
Player player = event .getPlayer ();
293
301
if (player .hasPermission ("lockettepro.admin.interfere" )) return ;
@@ -302,6 +310,7 @@ public void onAttemptPlaceInterfereBlocks(BlockPlaceEvent event){
302
310
@ EventHandler (priority = EventPriority .MONITOR )
303
311
public void onPlaceFirstBlockNotify (BlockPlaceEvent event ){
304
312
if (event .isCancelled ()) return ;
313
+ if (event .getPlayer () != null && event .getPlayer ().getWorld () != null && Config .isDisabledWorld (event .getPlayer ().getWorld ().getName ())) return ;
305
314
Block block = event .getBlock ();
306
315
Player player = event .getPlayer ();
307
316
if (!player .hasPermission ("lockettepro.lock" )) return ;
0 commit comments