From f169240c3a12251748718fc2c98034d8dfad2970 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 31 Aug 2016 09:31:37 +1000 Subject: [PATCH] Killing someone with gun/missile should only show that message to the current level, not the whole server. --- Commands/building/CmdImageprint.cs | 5 +++-- Player/Player.Handlers.cs | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Commands/building/CmdImageprint.cs b/Commands/building/CmdImageprint.cs index 3aa056dd3..2be12bb85 100644 --- a/Commands/building/CmdImageprint.cs +++ b/Commands/building/CmdImageprint.cs @@ -32,8 +32,9 @@ namespace MCGalaxy.Commands.Building { public override bool museumUsable { get { return false; } } public override LevelPermission defaultRank { get { return LevelPermission.Admin; } } public override CommandAlias[] Aliases { - get { return new[] { new CommandAlias("imgprint"), new CommandAlias("printimg"), - new CommandAlias("imgdraw"), new CommandAlias("drawimg") }; } + get { return new[] { new CommandAlias("imgprint"), new CommandAlias("printimg"), + new CommandAlias("imgdraw"), new CommandAlias("drawimg"), + new CommandAlias("drawimage"), new CommandAlias("printimage") }; } } public CmdImageprint() { } diff --git a/Player/Player.Handlers.cs b/Player/Player.Handlers.cs index 530a8dea7..842499767 100644 --- a/Player/Player.Handlers.cs +++ b/Player/Player.Handlers.cs @@ -404,8 +404,12 @@ return; if (b == Block.rockethead) level.MakeExplosion(x, y, z, 0); if (b == Block.creeper) level.MakeExplosion(x, y, z, 1); if (b == Block.rock || b == Block.stone) { - if (explode) level.MakeExplosion(x, y, z, 1); - SendChatFrom(this, ColoredName + "%S" + customMessage, false); + if (explode) level.MakeExplosion(x, y, z, 1); + if (b == Block.rock) { + SendChatFrom(this, ColoredName + "%S" + customMessage, false); + } else { + Chat.GlobalChatLevel(this, ColoredName + "%S" + customMessage, false); + } } if ( Game.team != null && this.level.ctfmode ) {