projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-11 21:45:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1437 from madsboddum/fix/admin/kill-invulnerable-npcs

Browse Source 
Killing an invulnerable NPC with /kill no longer grants XP
This commit is contained in:
Josh
2023-11-28 08:41:15 -06:00
committed by GitHub
parent 19ff9aee9b 0aac48ecac
commit ebfa2107f8
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatExperienceService.java
+4
View File
@@ -106,6 +106,10 @@ public class CombatExperienceService extends Service {
}
private void grantXpToKiller(CreatureObject killer, CreatureObject corpse, int experienceGained) {
if (corpse.hasOptionFlags(OptionFlag.INVULNERABLE)) {
return;
}
boolean xpMultiply = experienceGained > 1;
grantWeaponTypeXp(killer, corpse, experienceGained, xpMultiply);
src/test/java/com/projectswg/holocore/services/support/KillAdminCommandTest.kt
+22 -5
View File
@@ -38,6 +38,8 @@ import com.projectswg.holocore.resources.support.objects.ObjectCreator
import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureDifficulty
import com.projectswg.holocore.resources.support.objects.swg.custom.AIObject
import com.projectswg.holocore.services.gameplay.combat.CombatDeathblowService
import com.projectswg.holocore.services.gameplay.combat.CombatExperienceService
import com.projectswg.holocore.services.gameplay.player.experience.ExperiencePointService
import com.projectswg.holocore.services.gameplay.player.experience.skills.SkillService
import com.projectswg.holocore.services.support.global.commands.CommandExecutionService
import com.projectswg.holocore.services.support.global.commands.CommandQueueService
@@ -46,8 +48,7 @@ import com.projectswg.holocore.services.support.global.zone.ZoneService
import com.projectswg.holocore.services.support.global.zone.creation.CharacterCreationService
import com.projectswg.holocore.test.runners.TestRunnerSimulatedWorld
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNotEquals
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
@@ -64,6 +65,8 @@ class KillAdminCommandTest : TestRunnerSimulatedWorld() {
registerService(CommandQueueService(5))
registerService(CommandExecutionService())
registerService(CombatDeathblowService())
registerService(ExperiencePointService())
registerService(CombatExperienceService())
}
@AfterEach
@@ -75,13 +78,27 @@ class KillAdminCommandTest : TestRunnerSimulatedWorld() {
fun killNpc() {
memoryUserDatabase.addUser("username", "password", AccessLevel.DEV)
val character = HeadlessSWGClient.createZonedInCharacter("username", "password", "adminchar")
val npc = spawnNPCs("creature_bantha", character.player.creatureObject.location, 1).first()
val npc = spawnNPCs("creature_bantha", character.player.creatureObject.location, 1, NpcStaticSpawnLoader.SpawnerFlag.ATTACKABLE).first()
character.adminKill(npc)
assertEquals(Posture.DEAD, npc.posture)
}
@Test
fun killInvulnerableNpc() {
memoryUserDatabase.addUser("username", "password", AccessLevel.DEV)
val character = HeadlessSWGClient.createZonedInCharacter("username", "password", "adminchar")
val npc = spawnNPCs("creature_bantha", character.player.creatureObject.location, 1, NpcStaticSpawnLoader.SpawnerFlag.INVULNERABLE).first()
character.adminKill(npc)
assertAll(
{ assertEquals(Posture.DEAD, npc.posture, "admins should be able to kill invulnerable NPCs with /kill") },
{ assertTrue(character.player.playerObject.experience.isEmpty(), "admins should not gain experience from killing invulnerable NPCs") }
)
}
@Test
fun killSelf() {
memoryUserDatabase.addUser("username", "password", AccessLevel.DEV)
@@ -92,7 +109,7 @@ class KillAdminCommandTest : TestRunnerSimulatedWorld() {
assertNotEquals(Posture.DEAD, character.player.creatureObject)
}
private fun spawnNPCs(npcId: String, location: Location, amount: Int): Collection<AIObject> {
private fun spawnNPCs(npcId: String, location: Location, amount: Int, spawnerFlag: NpcStaticSpawnLoader.SpawnerFlag): Collection<AIObject> {
val egg = ObjectCreator.createObjectFromTemplate("object/tangible/ground_spawning/shared_patrol_spawner.iff")
egg.moveToContainer(null, location)
@@ -103,7 +120,7 @@ class KillAdminCommandTest : TestRunnerSimulatedWorld() {
.withMaxLevel(1)
.withLocation(location)
.withAmount(amount)
.withSpawnerFlag(NpcStaticSpawnLoader.SpawnerFlag.ATTACKABLE)
.withSpawnerFlag(spawnerFlag)
.build()
return NPCCreator.createAllNPCs(Spawner(spawnInfo, egg))