projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-15 23:05:45 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #356 from madsboddum/39

Browse Source 
Removed ability to change faction via /pvp command, it must now be done via the recruiters in-game #39
This commit is contained in:
Josh Larson
2021-04-09 18:15:09 -05:00
committed by GitHub
parent 009b9e5d60 59572279f7
commit a95134f66b
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/combat/CmdPVP.java
View File

@@ -3,7 +3,6 @@ package com.projectswg.holocore.resources.support.global.commands.callbacks.comb
import com.projectswg.common.data.encodables.tangible.PvpFaction;
import com.projectswg.holocore.intents.gameplay.gcw.faction.FactionIntent;
import com.projectswg.holocore.intents.support.global.chat.SystemMessageIntent;
import com.projectswg.holocore.resources.support.data.server_info.loader.ServerData;
import com.projectswg.holocore.resources.support.global.commands.ICmdCallback;
import com.projectswg.holocore.resources.support.global.player.Player;
import com.projectswg.holocore.resources.support.objects.swg.SWGObject;
@@ -16,17 +15,7 @@ public final class CmdPVP implements ICmdCallback {
public void execute(@NotNull Player player, SWGObject target, @NotNull String args) {
CreatureObject creature = player.getCreatureObject();
// Ziggy was using this to test until recruiters are enabled.
if (!args.isEmpty()) {
if (args.contains("imperial")) {
new FactionIntent(creature, ServerData.INSTANCE.getFactions().getFaction("imperial")).broadcast();
} else if (args.contains("rebel")) {
new FactionIntent(creature, ServerData.INSTANCE.getFactions().getFaction("rebel")).broadcast();
} else {
new FactionIntent(creature, ServerData.INSTANCE.getFactions().getFaction("neutral")).broadcast();
}
} else if (creature.getPvpFaction() != PvpFaction.NEUTRAL) {
if (creature.getPvpFaction() != PvpFaction.NEUTRAL) {
new FactionIntent(creature, FactionIntent.FactionIntentType.SWITCHUPDATE).broadcast();
} else {
SystemMessageIntent.broadcastPersonal(player, "@faction_recruiter:not_aligned");