diff --git a/Server/src/main/java/core/net/packet/in/ExaminePacket.java b/Server/src/main/java/core/net/packet/in/ExaminePacket.java index 47e916146..31e1486ed 100644 --- a/Server/src/main/java/core/net/packet/in/ExaminePacket.java +++ b/Server/src/main/java/core/net/packet/in/ExaminePacket.java @@ -33,9 +33,6 @@ public final class ExaminePacket implements IncomingPacket { player.debug("Object id: " + id + ", models: " + (d.getModelIds() != null ? Arrays.toString(d.getModelIds()) : null) + ", anim: " + d.animationId + ", config: " + (d.getVarbitID() != -1 ? d.getVarbitID() + " (file)" : d.getConfigId()) + "."); player.debug("Varp config index: " + VarbitDefinition.forObjectID(d.getVarbitID()).getConfigId()); player.getPacketDispatch().sendMessage(""+name+""); - /*if { - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection("LandscapeParser.removeGameObject(new GameObject("+coords+"));//"+ d.getName() ), null); - }*/ break; case 235: case 92: // Item examine diff --git a/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt b/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt index ad483fb35..343c2da4e 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt @@ -4,14 +4,14 @@ import api.* import core.cache.Cache import core.game.container.access.InterfaceContainer import core.game.content.quest.tutorials.tutorialisland.CharacterDesign -import core.game.node.scenery.Scenery -import core.game.node.scenery.SceneryBuilder import core.game.node.entity.combat.ImpactHandler.HitsplatType import core.game.node.entity.impl.Projectile import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.player.link.audio.Audio import core.game.node.item.Item +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.system.command.CommandSet import core.game.system.task.Pulse import core.game.world.map.Location @@ -25,8 +25,6 @@ import core.plugin.Initializable import core.plugin.Plugin import rs09.game.system.command.CommandPlugin import rs09.game.world.GameWorld -import java.awt.Toolkit -import java.awt.datatransfer.StringSelection /** * Represents the the command plugin used for visual commands. @@ -133,8 +131,6 @@ class VisualCommand : CommandPlugin() { npc.init() npc.isWalks = if (args.size > 2) true else false val npcString = "{" + npc.location.x + "," + npc.location.y + "," + npc.location.z + "," + (if (npc.isWalks) "1" else "0") + "," + npc.direction.ordinal + "}" - val clpbrd = Toolkit.getDefaultToolkit().systemClipboard - clpbrd.setContents(StringSelection(npcString), null) println(npcString) return true } diff --git a/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt index 61ec0d702..a67ab5557 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt @@ -1,7 +1,6 @@ package rs09.game.system.command.sets import api.* -import api.InputType import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition import core.cache.def.impl.SceneryDefinition @@ -32,9 +31,6 @@ import rs09.game.system.command.Command import rs09.game.system.command.CommandMapping import rs09.game.world.repository.Repository import rs09.tools.stringtools.colorize -import java.awt.Toolkit -import java.awt.datatransfer.StringSelection -import java.util.* @Initializable class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){ @@ -76,9 +72,6 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){ SystemLogger.logInfo("Viewport: " + l.getSceneX(player.playerFlags.lastSceneGraph) + "," + l.getSceneY(player.playerFlags.lastSceneGraph)) val loc = "Location.create(" + l.x + ", " + l.y + ", " + l.z + ")" SystemLogger.logInfo(loc + "; " + player.playerFlags.lastSceneGraph + ", " + l.localX + ", " + l.localY) - val stringSelection = StringSelection(loc) - val clpbrd = Toolkit.getDefaultToolkit().systemClipboard - clpbrd.setContents(stringSelection, null) } /** @@ -288,10 +281,6 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){ first = false } - val stringSelection = StringSelection(sb.toString()) - val clpbrd = Toolkit.getDefaultToolkit().systemClipboard - clpbrd.setContents(stringSelection, null) - log.clear() player.setAttribute("loc-log",log) } diff --git a/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt index df371d8b2..f2c8c30ee 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt @@ -1,16 +1,14 @@ package rs09.game.system.command.sets import core.cache.Cache -import core.game.node.scenery.Scenery -import core.game.node.scenery.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.item.Item +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder +import core.plugin.Initializable import rs09.game.system.SystemLogger import rs09.game.system.command.Command import rs09.game.system.command.CommandPlugin -import core.plugin.Initializable -import java.awt.Toolkit -import java.awt.datatransfer.StringSelection @Initializable class SpawnCommandSet : CommandSet(Command.Privilege.ADMIN){ @@ -29,9 +27,7 @@ class SpawnCommandSet : CommandSet(Command.Privilege.ADMIN){ npc.direction = player.direction npc.init() npc.isWalks = args.size > 2 - val npcString = "{" + npc.location.x + "," + npc.location.y + "," + npc.location.z + "," + (if (npc.isWalks) "1" else "0") + "," + npc.direction.ordinal + "}" - val clpbrd = Toolkit.getDefaultToolkit().systemClipboard - clpbrd.setContents(StringSelection(npcString), null) + val npcString = "{" + player!!.username + "," + npc.id + "," + npc.location.x + "," + npc.location.y + "," + npc.location.z + "}" println(npcString) }