Skip to content

Make target teleporters only check for player-owned protector fields. #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuroppoi merged 3 commits into from
Feb 2, 2026
Merged

Make target teleporters only check for player-owned protector fields. #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b47a87
make target teleporters only check protectors fields
boraini Mar 15, 2025
4aa92e9
use all field blocks
boraini May 25, 2025
e440d2b
Remove unused import in TargetTeleportInteraction
boraini Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...erver/src/main/java/brainwine/gameserver/item/interactions/TargetTeleportInteraction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ public void interact(Zone zone, Entity entity, int x, int y, Layer layer, Item i
player.notify("That area hasn't been explored yet.");
return;
}

// Check area protection
if(!player.isGodMode() && targetZone.isBlockProtected(targetX, targetY, player)) {
if(!player.isGodMode() && targetZone.isBlockProtectedByField(targetX, targetY, player)) {
Player owner = metaBlock.getOwner();
int setting = metaBlock.getIntProperty("pt");
boolean ownerCanEdit = !targetZone.isBlockProtected(targetX, targetY, owner);
boolean ownerCanEdit = !targetZone.isBlockProtectedByField(targetX, targetY, owner);

// Check protection entry setting
if(owner == null || !ownerCanEdit || setting == 0 || (setting == 1 && !owner.isFollowing(player))) {
Expand Down
10 changes: 9 additions & 1 deletion gameserver/src/main/java/brainwine/gameserver/zone/Zone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,14 @@ public boolean isBlockProtected(int x, int y, Player player, Collection<MetaBloc
return true;
}

return isBlockProtectedByField(x, y, player, fieldBlocks);
}

public boolean isBlockProtectedByField(int x, int y, Player player) {
return isBlockProtectedByField(x, y, player, fieldBlocks.values());
}

public boolean isBlockProtectedByField(int x, int y, Player player, Collection<MetaBlock> fieldBlocks) {
// Check field blocks
for(MetaBlock fieldBlock : fieldBlocks) {
Item item = fieldBlock.getItem();
Expand All @@ -675,7 +683,7 @@ public boolean isBlockProtected(int x, int y, Player player, Collection<MetaBloc
}
}
}

return false;
}

Expand Down