Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-12-05 00:43:25 +01:00
Code Issues Projects Releases Wiki Activity

Pull import changes from master

Browse Source
This commit is contained in:
Eric Stokes 2011-12-10 17:15:53 -07:00
commit 7668d14613
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -421,7 +421,11 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
* from the Servers Log Output. * from the Servers Log Output.
* *
* @param level The Log-{@link Level} * @param level The Log-{@link Level}
<<<<<<< HEAD
* @param msg The message * @param msg The message
=======
* @param msg The message
>>>>>>> master
*/ */
public void log(Level level, String msg) { public void log(Level level, String msg) {
staticLog(level, msg); staticLog(level, msg);
@ -448,7 +452,11 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Messag
* standard Server Console. * standard Server Console.
* *
* @param level The Log-{@link Level} * @param level The Log-{@link Level}
<<<<<<< HEAD
* @param msg The message * @param msg The message
=======
* @param msg The message
>>>>>>> master
*/ */
public static void staticDebugLog(Level level, String msg) { public static void staticDebugLog(Level level, String msg) {
log.log(level, "[MVCore-Debug] " + msg); log.log(level, "[MVCore-Debug] " + msg);