diff --git a/src/main/java/com/comandante/creeper/command/OpCommand.java b/src/main/java/com/comandante/creeper/command/OpCommand.java index 2031e0077da54392236d8036cb27adcd8ee08c22..a6a73b8df032db917a011206bc49b9728ca888e7 100644 --- a/src/main/java/com/comandante/creeper/command/OpCommand.java +++ b/src/main/java/com/comandante/creeper/command/OpCommand.java @@ -51,9 +51,13 @@ public class OpCommand extends Command { } ImmutableSortedSet<Channel> channels = user.getChannels(); for (Channel channel : channels) { - if (channel.getName().equals(gameManager.get)) - channel.send().op(user); + if (channel.getName().equals(gameManager.getCreeperConfiguration().ircChannel)) { + channel.send().op(user); + write("Ops given."); + return; + } } + write("Unable to give ops to user."); } finally { super.messageReceived(ctx, e); } diff --git a/src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java b/src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java index 597d26e90f6ccdfe7637bec4c1d8af002e62b148..ae5debe5f2359021d949be2c696269d8393d96d4 100644 --- a/src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java +++ b/src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java @@ -17,28 +17,42 @@ public class CreeperAuthenticationHandler extends SimpleChannelUpstreamHandler { - private static final String LOGO = "-=[ Merry *Croak*mas]=- 12/96 \n" + - " M E R R Y\n" + - " \"C R O A K\" M A S ! _..------.._\n" + - " .-\" \".\n" + - " .' \\\n" + - " ' .''. / / \\\n" + - " '..' '. \\/ /---.----.--.---.-( \\\n" + - " '.()o { } |\n" + - " ____ \"\" {____.-._____.-.____}\\ | ____\n" + - " / `\"=._ _/ (o ) (o ) \\_ `\\ |_ _.=\"` \\\n" + - " | \"=. /' '-'_,-,_'-' `\\ / \\ .=\" |\n" + - " | \". \". | '. _.\"_.-._\"._ .' |\\__/\" .\" |\n" + - " \". \". \". \\ `\"-.~._^_.~.-\"` / .\" .\" .\"\n" + - " \". \". \". `--._ `-.~.-` _.--` .\" .\" .\"\n" + - " \"=._ \". \"=./ `._ _.` \\.=\" .\" _.=\"\n" + - " \"=._ \"._ / `\"\"\"\"\"` \\ _.\" _.=\"\n" + - " \"=. \"-. : : .-\" .=\"\n" + - " \". \"| Y Y |\" .\"\n" + - " _.=\"` _\\ \\ / /_ `\"=._ \n" + - " _.-\"\"\"``\"\"` _.-\"`__\\ \\-.____.-/ /__`\"-._ `\"\"``\"\"\"-._\n" + - " .-'.-' _.-'_.-\"`jgs.' .' .'\\ \\ / /'. '._'. `\"-._'-._'-.'-.\n" + - " `\"` `\"` `\"` `\"` `\"` `\"` `\"` `\"` `\"` `\"` `\"` `\"`"; + + private static final String LOGO = " .:::::::::::... \n" + + " .::::::::::::::::::::. \n" + + " .::::::::::::::::::::::::. \n" + + " ::::::::::::::::::::::::::::. \n" + + " ::::::::::::::::::::::::::::::: .,uuu ... \n" + + " :::::::::::::::::::::::::::::::: dHHHHHLdHHHHb \n" + + " ....:::::::'` ::::::::::::::::::' uHHHHHHHHHHHHHF \n" + + " .uHHHHHHHHH' ::::::::::::::`. uHHHHHHHHHHHHHP\" \n" + + " HHHHHHHHHHH `:::::::::::',dHHuHHHHHHHHP\".g@@g \n" + + " J\"HHHHHHHHHP 4H ::::::::' u$$$. \n" + + " \".HHHHHHHHP\" .,uHP :::::' uHHHHHHHHHHP\"\",e$$$$$c \n" + + " HHHHHHHF' dHHHHf `````.HHHHHHHHHHP\",d$$$$$$$P%C \n" + + " .dHHHP\"\" JHHHHbuuuu,JHHHHHHHHP\",d$$$$$$$$$e=,z$$$$$$$$ee.. \n" + + " \"\" .HHHHHHHHHHHHHHHHHP\",gdP\" ..3$$$Jd$$$$$$$$$$$$$$e. \n" + + " dHHHHHHHHHHHHHHP\".edP \" .zd$$$$$$$$$$$\"3$$$$$$$$c \n" + + " `???\"\"??HHHHP\",e$$F\" .d$,?$$$$$$$$$$$$$F d$$$$$$$$F\" \n" + + " ?be.eze$$$$$\".d$$$$ $$$E$$$$P\".,ede`?$$$$$$$$ \n" + + " 4.\"?$$$$$$$ z$$$$$$ $$$$r.,.e ?$$$$ $$$$$$$$$ \n" + + " '$c \"$$$$ .d$$$$$$$ 3$$$.$$$$ 4$$$ d$$$$P\"`,, \n" + + " \"\"\"- \"$$\".`$$\" \" $$f,d$$P\".$$P zeee.zd$$$$$. \n" + + " ze. .C$C\"=^\" ..$$$$$$P\".$$$'e$$$$$P?$$$$$$ \n" + + " .e$$$$$$$\"=\"$f\",c,3eee$$$$$$$$P $$$P'd$$$$\"..::..\"?$% \n" + + " 4d$$$P d$$$dF.d$$$$$$$$$$$$$$$$f $$$ d$$$\" :::::::::. \n" + + " $$$$$$ d$$$$$ $$$$$$$$$$$$$$$$$$ J$$\",$$$'.:::::::::::: \n" + + " \"$$$$$$ ?$$$$ d$$$$$$$$$$$$$$$P\".dP'e$$$$'::::::::::::::: \n" + + " 4$$$$$$c $$$$b`$$$$$$$$$$$P\"\",e$$\",$$$$$' :::::::::::::::: \n" + + " ' ?\"?$$$b.\"$$$$.?$$$$$$P\".e$$$$F,d$$$$$F :::::::::::::::::: \n" + + " \"?$$bc.\"$b.$$$$F z$$P?$$\",$$$$$$$ :::::::::::::::::::: \n" + + " `\"$$c\"?$$$\".$$$)e$$F,$$$$$$$' :::::::::::::::::::: \n" + + " ':. \"$b...d$$P4$$$\",$$$$$$$\" ::::::::::::::::::::: \n" + + " ':::: \"$$$$$\".,\"\".d$$$$$$$F :::::::::::::::::::::: \n" + + " :::: be.\"\".d$$$4$$$$$$$$F ::::::::::::::::::::::: \n" + + " :::: \"??$$$$$$$$$$?$P\" ::::::::::::::::::::::::: \n" + + " :::::: ?$$$$$$$$f .:::::::::::::::::::::::::::: \n" + + " :::::::`\"????\"\".:::::::::::::::::::::::::::::: \n"; public CreeperAuthenticationHandler(GameManager gameManager) { this.gameManager = gameManager;