PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-06 05:30:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolving cherry-pick of commit

Browse source
This commit is contained in:
FateJH 2017-10-24 20:47:33 -04:00
parent 3bb878ac10
commit 33403c24dd
4 changed files with 212 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pslogin/src/main/scala/PsLogin.scala
View file

@ -229,6 +229,8 @@ object PsLogin {
LocalObject(DoorObjectBuilder(door, 330))
LocalObject(DoorObjectBuilder(door, 332))
LocalObject(DoorObjectBuilder(door, 370))
LocalObject(DoorObjectBuilder(door, 371))
LocalObject(DoorObjectBuilder(door, 372))
LocalObject(DoorObjectBuilder(door, 373))
LocalObject(IFFLockObjectBuilder(lock_external, 556))

9
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -586,7 +586,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
avatarService ! AvatarServiceMessage(tplayer.Continent, AvatarAction.EquipmentInHand(player_guid, slot, item))
}
case None =>
continent.Actor ! Zone.DropItemOnGround(item, item.Position, item.Orientation) //restore
continent.Ground ! Zone.DropItemOnGround(item, item.Position, item.Orientation) //restore
}
case ItemHacking(tplayer, target, tool_guid, delta, completeAction, tickAction) =>
@ -1390,7 +1390,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
def Execute(resolver : ActorRef) : Unit = {
localTarget.Slot(localIndex).Equipment = localObject
resolver ! scala.util.Success(localObject)
resolver ! scala.util.Success(this)
}
override def onSuccess() : Unit = {
@ -1442,8 +1442,9 @@ class WorldSessionActor extends Actor with MDCContextAware {
}
def Execute(resolver : ActorRef) : Unit = {
log.info(s"Player $localPlayer is registered")
resolver ! scala.util.Success(this)
localAnnounce ! PlayerLoaded(localPlayer) //alerts WSA
resolver ! scala.util.Success(localPlayer)
}
override def onFailure(ex : Throwable) : Unit = {
@ -1536,7 +1537,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
def Execute(resolver : ActorRef) : Unit = {
localTarget.Slot(localIndex).Equipment = None
resolver ! scala.util.Success(localObject)
resolver ! scala.util.Success(this)
}
override def onSuccess() : Unit = {