Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private void handle(CommandContext<Sender> context) {
}

// trigger the faction rename event (cancellable)
FactionRenameEvent renameEvent = new FactionRenameEvent(sender, tag);
FactionRenameEvent renameEvent = new FactionRenameEvent(faction, sender, tag);
Bukkit.getServer().getPluginManager().callEvent(renameEvent);
if (renameEvent.isCancelled()) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private void handle(CommandContext<Sender> context) {
return;
}

FactionRenameEvent renameEvent = new FactionRenameEvent(sender, tag);
FactionRenameEvent renameEvent = new FactionRenameEvent(faction, sender, tag);
Bukkit.getServer().getPluginManager().callEvent(renameEvent);
if (renameEvent.isCancelled()) {
return;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.kitteh.factions.event;

import dev.kitteh.factions.FPlayer;
import dev.kitteh.factions.Faction;
import org.bukkit.event.Cancellable;
import org.jetbrains.annotations.ApiStatus;
import org.jspecify.annotations.NullMarked;
Expand All @@ -12,7 +13,13 @@ public class FactionRenameEvent extends FactionPlayerEvent implements Cancellabl
private final String tag;

public FactionRenameEvent(FPlayer sender, String newTag) {
super(sender.faction(), sender);
this(sender.faction(), sender, newTag);
}

// Administrative renames must identify the target, not the sender's faction.
// Upstream: https://github.com/FactionsU/UID/issues/57
public FactionRenameEvent(Faction faction, FPlayer sender, String newTag) {
super(faction, sender);
tag = newTag;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package dev.kitteh.factions.event;

import dev.kitteh.factions.FPlayer;
import dev.kitteh.factions.Faction;
import org.junit.jupiter.api.Test;

import java.lang.reflect.Proxy;

import static org.junit.jupiter.api.Assertions.*;

class FactionRenameEventTest {
@Test
void administrativeRenameKeepsTargetSeparateFromSenderFaction() {
Faction own = faction();
Faction target = faction();
FPlayer sender = player(own);
FactionRenameEvent event = new FactionRenameEvent(target, sender, "North");

assertSame(target, event.getFaction());
assertNotSame(own, event.getFaction());
assertSame(sender, event.getFPlayer());
assertEquals("North", event.getFactionTag());
assertFalse(event.isCancelled());
event.setCancelled(true);
assertTrue(event.isCancelled());
}

@Test
void existingConstructorPreservesOwnFactionBehavior() {
Faction own = faction();
FPlayer sender = player(own);
FactionRenameEvent event = new FactionRenameEvent(sender, "North");
assertSame(own, event.getFaction());
assertSame(sender, event.getFPlayer());
assertEquals("North", event.getFactionTag());
}

private static Faction faction() {
return (Faction) Proxy.newProxyInstance(Faction.class.getClassLoader(),
new Class<?>[]{Faction.class}, (proxy, method, args) -> {
throw new AssertionError("Unexpected faction access: " + method.getName());
});
}

private static FPlayer player(Faction own) {
return (FPlayer) Proxy.newProxyInstance(FPlayer.class.getClassLoader(),
new Class<?>[]{FPlayer.class}, (proxy, method, args) -> {
if (method.getName().equals("faction") && method.getParameterCount() == 0) {
return own;
}
throw new AssertionError("Unexpected player access: " + method.getName());
});
}
}