Skip to content

#137 Prevent users fromn creating new planets with the same name as an existing planet. #145

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
Raugharr merged 1 commit into from
Jan 21, 2026
Merged

#137 Prevent users fromn creating new planets with the same name as an existing planet. #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 17 additions & 8 deletions MekWarsClient/src/mekwars/admin/AdminMapPopupMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,23 @@ public void actionPerformed(ActionEvent ex) {

public void actionPerformed(ActionEvent ex) {
String planetName = JOptionPane.showInputDialog(mwclient.getGUIClient().getMainFrame(),"Planet Name?");
if ( planetName == null || planetName.length() == 0 )
return;
if (planetName != null && planetName.length() != 0) {
if (CampaignData.cd.getPlanetByName(planetName) != null) {
JOptionPane.showMessageDialog(mwclient.getGUIClient().getMainFrame(),
"Planet with name " + planetName + " already exists.",
"Unable to create planet",
JOptionPane.WARNING_MESSAGE
);
} else {
mwclient.sendChat(GameHost.CAMPAIGN_PREFIX + "c admincreateplanet#"
+ planetName + "#" + xcoord + "#" + ycoord);
mwclient.refreshData();
mp.repaint();
int id = CampaignData.cd.getPlanetByName(planetName).getId();
new PlanetEditorDialog(mwclient, planetName, id);
}
}

mwclient.sendChat(GameHost.CAMPAIGN_PREFIX + "c admincreateplanet#"+planetName+"#"+xcoord+"#"+ycoord);
mwclient.refreshData();
mp.repaint();
int id = CampaignData.cd.getPlanetByName(planetName).getId();
new PlanetEditorDialog(mwclient, planetName, id);
}
});
if ( userLevel >= mwclient.getData().getAccessLevel("AdminCreatePlanet") )
Expand Down Expand Up @@ -200,4 +209,4 @@ public void actionPerformed(ActionEvent ex) {

}//end constructor

}//end AdminMapPopup
}//end AdminMapPopup
13 changes: 10 additions & 3 deletions MekWarsServer/src/mekwars/server/campaign/commands/admin/AdminCreatePlanetCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@
import mekwars.server.campaign.SHouse;
import mekwars.server.campaign.SPlanet;
import mekwars.server.campaign.commands.Command;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

/**
* @author Helge Richter
*
*/
public class AdminCreatePlanetCommand implements Command {
private static final Logger LOGGER = LogManager.getLogger(AdminCreatePlanetCommand.class);
int accessLevel = IAuthenticator.ADMIN;
String syntax = "Planet Name#Xcood#YCoord#";
public int getExecutionLevel(){return accessLevel;}
Expand All @@ -61,7 +62,13 @@ public void process(StringTokenizer command,String Username) {
HashMap<Integer,Integer> flu = new HashMap<Integer,Integer>();
flu.put(faction.getId(),100);
SPlanet planet = new SPlanet(PlanetName, new Influences(flu), 0, xcood, ycood);
CampaignMain.cm.addPlanet(planet);
try {
CampaignMain.cm.addPlanet(planet);
} catch (Exception exception) {
LOGGER.error("Unable to create planet", exception);
CampaignMain.cm.toUser("Unable to create planet " + planet, Username, true);
return;
}
planet.setOwner(null,faction,true);
planet.setOriginalOwner(faction.getName());
planet.updated();
Expand Down