2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages Wiki Activity

Revert "remove clan ranks and admin extras"

Browse source 
This reverts commit 9851e5964f.
This commit is contained in:
RedSparr0w 2019-09-21 09:41:19 +12:00
parent 98a8005de4
commit 06041578a8
7 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
09HDscape-server/src/org/crandor/game/node/entity/npc/agg/AggressiveHandler.java
View file

@ -81,7 +81,9 @@ public final class AggressiveHandler {
Entity target = behavior.getLogicalTarget(entity, behavior.getPossibleTargets(entity, radius));
if (target instanceof Player) {
if (target.getAttribute("ignore_aggression", false)) {
return false;
if (((Player) target).getRights().equals(Rights.ADMINISTRATOR)) {
return false;
}
}
}
if (target != null) {

2
09HDscape-server/src/org/crandor/game/node/entity/player/Player.java
View file

@ -501,7 +501,7 @@ public class Player extends Entity {
Repository.sendNews("Ultimate ironman "+this.getUsername()+" has just perished.");
}
packetDispatch.sendTempMusic(90);
if (!getZoneMonitor().handleDeath(killer) && (!getProperties().isSafeZone() && getZoneMonitor().getType() != ZoneType.SAFE.getId())) {
if (!getZoneMonitor().handleDeath(killer) && (!getProperties().isSafeZone() && getZoneMonitor().getType() != ZoneType.SAFE.getId()) && getDetails().getRights() != Rights.ADMINISTRATOR) {
GroundItemManager.create(new Item(526), getLocation(), k);
final Container[] c = DeathTask.getContainers(this);
boolean gravestone = graveManager.generateable() && getIronmanManager().getMode() != IronmanMode.ULTIMATE;

3
09HDscape-server/src/org/crandor/game/node/entity/player/link/grave/GraveManager.java
View file

@ -93,6 +93,9 @@ public class GraveManager implements SavingModule {
* @return {@code True} if so.
*/
public boolean generateable() {
if (player.getDetails().getRights() == Rights.ADMINISTRATOR && GameWorld.getSettings().isHosted()) {
return false;
}
if (player.getSkullManager().isWilderness()) {
return false;
}

2
09HDscape-server/src/org/crandor/game/system/communication/ClanRank.java
View file

@ -5,7 +5,7 @@ package org.crandor.game.system.communication;
* @author Emperor
*/
public enum ClanRank {
NONE(-1, "Anyone"), FRIEND(0, "Any friends"), RECRUIT(1, "Recruit+"), CORPORAL(2, "Corporal+"), SERGEANT(3, "Sergeant+"), LIEUTENANT(4, "Lieutenant+"), CAPTAIN(5, "Captain+"), GENERAL(6, "General+"), OWNER(7, "Only me");
NONE(-1, "Anyone"), FRIEND(0, "Any friends"), RECRUIT(1, "Recruit+"), CORPORAL(2, "Corporal+"), SERGEANT(3, "Sergeant+"), LIEUTENANT(4, "Lieutenant+"), CAPTAIN(5, "Captain+"), GENERAL(6, "General+"), OWNER(7, "Only me"), KELDAGRIM_MOD(127, "No-one");
/**
* The value of the rank.

5
09HDscape-server/src/org/crandor/game/system/communication/ClanRepository.java
View file

@ -61,7 +61,7 @@ public final class ClanRepository {
/**
* The rank required for loot-share.
*/
private ClanRank lootRequirement = ClanRank.CAPTAIN;
private ClanRank lootRequirement = ClanRank.KELDAGRIM_MOD;
/**
* The members mapping.
@ -312,6 +312,9 @@ public final class ClanRepository {
*/
public ClanRank getRank(Player player) {
ClanRank rank = ranks.get(player.getName());
if (player.getDetails().getRights() == Rights.ADMINISTRATOR && !player.getName().equals(owner)) {
return ClanRank.KELDAGRIM_MOD;
}
if (rank == null) {
if (player.getName().equals(owner)) {
return ClanRank.OWNER;

2
09HDscape-server/src/org/crandor/game/system/communication/CommunicationInfo.java
View file

@ -72,7 +72,7 @@ public final class CommunicationInfo {
/**
* The rank required for loot-share.
*/
private ClanRank lootRequirement = ClanRank.CAPTAIN;
private ClanRank lootRequirement = ClanRank.KELDAGRIM_MOD;
/**
* If lootshare is enabled.

2
09HDscape-server/src/plugin/interaction/inter/ClanInterfacePlugin.java
View file

@ -72,7 +72,7 @@ public final class ClanInterfacePlugin extends ComponentPlugin {
break;
case 26:
if (opcode == 230) {
clan.setLootRequirement(ClanRank.CAPTAIN);
clan.setLootRequirement(ClanRank.KELDAGRIM_MOD);
} else {
clan.setLootRequirement(getRank(opcode));
}