Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request 'Update master' (#5) from dev into master

Browse source 
Reviewed-on: #5
This commit is contained in:
randy 2024-11-21 17:45:09 -07:00
commit e19c89f441
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Server/src/main/content/global/skill/summoning/familiar/Familiar.java
View file

@ -225,10 +225,14 @@ public abstract class Familiar extends NPC implements Plugin<Object> {
@Override
public void handleTickActions() {
//Snowscape: only count down the familiar timer if summoning points are zero
//Snowscape: only count down the familiar timer if summoning points are zero, and give some summoning exp every minute a familiar is summoned.
if (owner.getSkills().getLevel(Skills.SUMMONING) == 0) {
ticks--;
}
if (getWorldTicks() % 100 == 0) {
owner.getSkills().addExperience(Skills.SUMMONING, pouch.getLevelRequired()+10, true);
}
fracDrain += pointsPerTick;
if (fracDrain > 1.0 && ticks > 0) {
fracDrain -= 1.0;

3
Server/src/main/core/game/system/timer/impl/AntiMacro.kt
View file

@ -41,7 +41,8 @@ class AntiMacro : PersistTimer(0, "antimacro", isAuto = true), Commands {
override fun onRegister(entity: Entity) {
if (entity !is Player || entity.isArtificial)
entity.timers.removeTimer(this)
if (entity is Player && entity.rights == Rights.ADMINISTRATOR)
//if (entity is Player && entity.rights == Rights.ADMINISTRATOR)
if (entity is Player)
paused = true
if (runInterval == 0)