mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-04 08:39:05 +00:00
Projectile clipping, PassDoor fix (#176)
* Numbered packet sizes. Corrected sound packet length to 6 from 5. Corrected sound packet in server. Teleport sound now plays correctly. Corrected modern teleport animation playthrough. Removed redundant teleport delay. * Changed sendSound packet size back to 5 and removed type attribute to maintain compatibility with Parabot. * After running around an object to attack the player will no longer wait a number of ticks to start attacking again. Fixed an issue where walkTo being called from CycleEvents would not execute correctly. Player will no longer face a killed npc after it respawns. Added projectile clipping. Added a new algorithm for player->player/npc following that accounts for projectile clipping.
This commit is contained in:
committed by
Daniel Ginovker
parent
a4e4b89d99
commit
c827d46ca0
@@ -26,6 +26,7 @@ import redone.game.content.combat.magic.MagicTeleports;
|
||||
import redone.game.content.combat.prayer.PrayerData;
|
||||
import redone.game.content.combat.prayer.PrayerDrain;
|
||||
import redone.game.content.combat.range.DwarfCannon;
|
||||
import redone.game.content.combat.range.RangeData;
|
||||
import redone.game.content.consumables.Food;
|
||||
import redone.game.content.consumables.Potions;
|
||||
import redone.game.content.guilds.impl.RangersGuild;
|
||||
@@ -62,6 +63,7 @@ import redone.game.items.impl.PotionMixing;
|
||||
import redone.game.items.impl.Teles;
|
||||
import redone.game.items.impl.Weight;
|
||||
import redone.game.npcs.NpcActions;
|
||||
import redone.game.npcs.NpcHandler;
|
||||
import redone.game.objects.ObjectsActions;
|
||||
import redone.game.players.antimacro.AntiBotting;
|
||||
import redone.game.shops.ShopAssistant;
|
||||
@@ -394,6 +396,10 @@ public class Client extends Player {
|
||||
currentTask = CycleEventHandler.getSingleton().addEvent(this, event, ticksBetweenExecution);
|
||||
}
|
||||
|
||||
public CycleEventContainer getCurrentTask() {
|
||||
return currentTask;
|
||||
}
|
||||
|
||||
public void endCurrentTask() {
|
||||
if (currentTask != null && currentTask.isRunning()) {
|
||||
currentTask.stop();
|
||||
@@ -1069,11 +1075,11 @@ public class Client extends Player {
|
||||
teleTimer = 0;
|
||||
getPlayerAssistant().changeLocation();
|
||||
}
|
||||
if (teleTimer == 5) {
|
||||
if (teleTimer == 4) {
|
||||
teleTimer--;
|
||||
getPlayerAssistant().processTeleport();
|
||||
}
|
||||
if (teleTimer == 9 && teleGfx > 0) {
|
||||
if (teleTimer == 7 && teleGfx > 0) {
|
||||
teleTimer--;
|
||||
gfx100(teleGfx);
|
||||
}
|
||||
@@ -1091,6 +1097,9 @@ public class Client extends Player {
|
||||
}
|
||||
}
|
||||
|
||||
combatAssistant.attackingNpcTick();
|
||||
combatAssistant.attackingPlayerTick();
|
||||
|
||||
if (attackTimer > 0) {
|
||||
attackTimer--;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user