projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-01-16 23:04:20 -05:00
Code Issues Projects Releases Wiki Activity

Merged in M4SS/holocore/192 (pull request #675)

Browse Source 
#192: Creatures that aren't controlled by a player now receive protection from armor
This commit is contained in:
Mads Boddum
2019-10-18 16:32:09 +00:00
committed by Obique PSWG
parent c12fd009f4 e21e337dac
commit 71924a7c64
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/ProtectionService.kt
View File

@@ -69,14 +69,14 @@ class ProtectionService : Service() {
val newContainer = intent.container
val oldContainer = intent.oldContainer
if (item.owner == null) {
// Important that we don't grant protection to players while they are not online: https://bitbucket.org/projectswg/holocore/issues/192/protection-from-equipment-is-no-longer
return
}
if (newContainer is CreatureObject) {
// They equipped something
if (newContainer.isPlayer && item.owner == null) {
// Important that we don't grant protection to players while they are not online: https://bitbucket.org/projectswg/holocore/issues/192/protection-from-equipment-is-no-longer
return
}
handleTransfer(item, newContainer, item.arrangement.getOrNull(intent.arrangement-4) ?: EMPTY_LIST, true) // newContainer is a character
} else if (oldContainer is CreatureObject) {
// They unequipped something