Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

implement server side restrictions

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-02-13 21:01:09 -06:00
parent f952785c8e
commit 6c1e2f1280
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/ItemBase.java
+8 -4
View File
@@ -969,14 +969,16 @@ public class ItemBase {
} }
public Boolean ValidClass(Enum.ClassType base,Enum.ClassType profession){ public Boolean ValidClass(Enum.ClassType base,Enum.ClassType profession){
if(this.requiredClasses.isEmpty() && this.restrictedClasses.isEmpty()) boolean requiredEmpty = this.requiredClasses == null || this.requiredClasses.isEmpty();
boolean restrictedEmpty = this.restrictedClasses == null || this.restrictedClasses.isEmpty();
if(requiredEmpty && restrictedEmpty)
return true; return true;
if(this.requiredClasses.isEmpty() == false) if(this.requiredClasses != null && this.requiredClasses.isEmpty() == false)
if(this.requiredClasses.contains(base) || this.requiredClasses.contains(profession)) if(this.requiredClasses.contains(base) || this.requiredClasses.contains(profession))
return true; return true;
if(this.restrictedClasses.isEmpty() == false) if(this.restrictedClasses != null && this.restrictedClasses.isEmpty() == false)
if(this.restrictedClasses.contains(base) == false && this.restrictedClasses.contains(profession) == false) if(this.restrictedClasses.contains(base) == false && this.restrictedClasses.contains(profession) == false)
return true; return true;
@@ -984,7 +986,9 @@ public class ItemBase {
} }
public Boolean ValidDiscipline(EnumSet<Enum.DisciplineType> discs){ public Boolean ValidDiscipline(EnumSet<Enum.DisciplineType> discs){
if(this.requiredDiscs.isEmpty() && this.restrictedDiscs.isEmpty()) boolean requiredEmpty = this.requiredDiscs == null || this.requiredDiscs.isEmpty();
boolean restrictedEmpty = this.restrictedDiscs == null || this.restrictedDiscs.isEmpty();
if(requiredEmpty && restrictedEmpty)
return true; return true;
for(Enum.DisciplineType disc : discs){ for(Enum.DisciplineType disc : discs){
src/engine/objects/PlayerCharacter.java
+5 -1
View File
@@ -4575,11 +4575,15 @@ public class PlayerCharacter extends AbstractCharacter {
else else
this.absGender = SexType.FEMALE; this.absGender = SexType.FEMALE;
for(CharacterRune rune : this.runes){ for(CharacterRune rune : this.runes){
try { try {
DisciplineType disc = DisciplineType.valueOf(RuneBase.getRuneBase(rune.getRuneBaseID()).getName().replace("-", "").replace(" ", "")); DisciplineType disc = DisciplineType.valueOf(RuneBase.getRuneBase(rune.getRuneBaseID()).getName().replace("-", "").replace(" ", ""));
if (disc != null) { if (disc != null) {
this.absDisciplines.add(disc); if(this.absDisciplines == null)
this.absDisciplines = EnumSet.of(disc);
else
this.absDisciplines.add(disc);
} }
} catch(Exception e){ } catch(Exception e){