yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an exploit related to magic.

Browse Source
This commit is contained in:
ceikry
2021-07-02 10:24:37 -05:00
parent 2c9f0e7cf3
commit 60f32629c2
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/combat/equipment/WeaponInterface.java
+1
View File
@@ -464,6 +464,7 @@ public final class WeaponInterface extends Component {
Component component = new Component(id); Component component = new Component(id);
component.getDefinition().setTabIndex(0); component.getDefinition().setTabIndex(0);
component.getDefinition().setType(InterfaceType.TAB); component.getDefinition().setType(InterfaceType.TAB);
player.setAttribute("autocast_component",component);
player.getInterfaceManager().openTab(component); player.getInterfaceManager().openTab(component);
} }
Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt
+16 -2
View File
@@ -1,5 +1,6 @@
package rs09.game.node.entity.combat package rs09.game.node.entity.combat
import core.game.component.Component
import core.game.container.Container import core.game.container.Container
import core.game.container.impl.EquipmentContainer import core.game.container.impl.EquipmentContainer
import core.game.node.Node import core.game.node.Node
@@ -7,8 +8,7 @@ import core.game.node.entity.Entity
import core.game.node.entity.combat.BattleState import core.game.node.entity.combat.BattleState
import core.game.node.entity.combat.CombatStyle import core.game.node.entity.combat.CombatStyle
import core.game.node.entity.combat.InteractionType import core.game.node.entity.combat.InteractionType
import core.game.node.entity.combat.equipment.ArmourSet import core.game.node.entity.combat.equipment.*
import core.game.node.entity.combat.equipment.DegradableEquipment
import core.game.node.entity.npc.NPC import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player import core.game.node.entity.player.Player
import core.game.node.entity.player.link.audio.Audio import core.game.node.entity.player.link.audio.Audio
@@ -219,6 +219,20 @@ abstract class CombatSwingHandler(var type: CombatStyle?) {
* @return `True` if so. * @return `True` if so.
*/ */
open fun isAttackable(entity: Entity, victim: Entity): InteractionType? { open fun isAttackable(entity: Entity, victim: Entity): InteractionType? {
val comp = entity.getAttribute("autocast_component",null) as Component?
if((comp != null || type == CombatStyle.MAGIC) && (entity.properties.autocastSpell == null || entity.properties.autocastSpell.spellId == 0) && entity is Player){
val weapEx = entity.getExtension<Any>(WeaponInterface::class.java) as WeaponInterface?
if(comp != null){
entity.interfaceManager.close(comp)
entity.interfaceManager.openTab(weapEx)
entity.properties.combatPulse.stop()
entity.attack(victim)
entity.removeAttribute("autocast_component")
}
weapEx?.setAttackStyle(1)
weapEx?.updateInterface()
entity.debug("Adjusting attack style")
}
if (entity.location == victim.location) { if (entity.location == victim.location) {
return if (entity.index < victim.index && victim.properties.combatPulse.getVictim() === entity) { return if (entity.index < victim.index && victim.properties.combatPulse.getVictim() === entity) {
InteractionType.STILL_INTERACT InteractionType.STILL_INTERACT