diff --git a/src/main/java/net/pietru/cookie_utils/api/Region.java b/src/main/java/net/pietru/cookie_utils/api/Region.java index bfec5ad..9aea3f1 100644 --- a/src/main/java/net/pietru/cookie_utils/api/Region.java +++ b/src/main/java/net/pietru/cookie_utils/api/Region.java @@ -166,7 +166,10 @@ public class Region { area.setCorners(a, b); - area.name=f.getName(); + area.name = f.getPath().replace(regions_folder.getPath(), "").replace("\\", "/"); + if (area.name.startsWith("/")) + area.name = area.name.substring(1); + area.enabled=region.getBoolean("enabled",true); area.protect=region.getBoolean("protect",false); @@ -263,7 +266,9 @@ public class Region { if (perm.player_id.isEmpty()) continue; - perm.filename=f.getName(); + perm.filename = f.getPath().replace(perms_folder.getPath(), "").replace("\\", "/"); + if (area.name.startsWith("/")) + area.name = area.name.substring(1); perm.type=perm_json.getString("type", ""); perm.enabled=perm_json.getBoolean("enabled", false); diff --git a/src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java index cf5188e..5d55701 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java @@ -33,7 +33,7 @@ public class BlockBreakMixin { @Inject(method = "handle", at = @At("HEAD"), cancellable = true) private void event_block_break(CallbackInfo ci, @Local NetworkIdentity identity, @Local ChannelHandlerContext ctx){ - if (identity.getSide() != NetworkSide.CLIENT) { + if (identity.isServer()) { Account account = ServerSingletons.getAccount(identity); if (!Permissions.has_user_special_perm(account.getUniqueId()) && !can_edit_block(blockPos,"break",account.getUniqueId())) { diff --git a/src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java index 9cd63b8..fdb998e 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java @@ -35,11 +35,11 @@ public class BlockPlaceMixin { @Inject(method = "handle", at = @At("HEAD"), cancellable = true) private void event_block_place(CallbackInfo ci, @Local NetworkIdentity identity, @Local ChannelHandlerContext ctx){ - if (identity.getSide() != NetworkSide.CLIENT) { + if (identity.isServer()) { if (targetBlockState instanceof BlockStateMissing) ci.cancel(); } - if (identity.getSide() != NetworkSide.CLIENT && !ci.isCancelled()) { + if (identity.isServer() && !ci.isCancelled()) { Account account = ServerSingletons.getAccount(identity); if (!Permissions.has_user_special_perm(account.getUniqueId()) && !can_edit_block(blockPos,"place",account.getUniqueId())) { ci.cancel(); diff --git a/src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java index 4d8bf54..7eb04ce 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java @@ -34,7 +34,7 @@ public class InteractBlockMixin { @Inject(method = "handle", at = @At("HEAD"), cancellable = true) private void event_block_interact(CallbackInfo ci, @Local NetworkIdentity identity, @Local ChannelHandlerContext ctx){ - if (identity.getSide() != NetworkSide.CLIENT) { + if (identity.isServer()) { Account account = ServerSingletons.getAccount(identity); if (blockPos!=null) { BlockPosition temp = blockPos.copy(); diff --git a/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java index de6ada9..6db511f 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java @@ -49,7 +49,7 @@ public class MessagePacketMixin { ply_msgs.put(playerUniqueId,new MessageInfo()); } - if (identity.getSide() != NetworkSide.CLIENT && !ci.isCancelled()) { + if (identity.isServer() && !ci.isCancelled()) { Account account = ServerSingletons.getAccount(identity); if (message.startsWith(":")) { String cmd = message.replaceFirst(":",""); diff --git a/src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java index 0923d33..c530bd5 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java @@ -42,7 +42,7 @@ public class PlayerPositionMixin { @Inject(method = "handle", at = @At("HEAD"), cancellable = true) private void event_player_move(CallbackInfo ci, @Local NetworkIdentity identity, @Local ChannelHandlerContext ctx){ - if (identity.getSide() != NetworkSide.CLIENT) { + if (identity.isServer()) { Account account = ServerSingletons.getAccount(identity); Player player = ServerSingletons.getPlayer(identity);