From 301396a116b1d0218d8beb657dc532b9b8b341c8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 13 Jul 2015 19:22:08 +1000 Subject: [PATCH] Add note about BungeeCord when in offline mode. See PR #10 for motivation. --- .../0096-Treat-Bungee-as-Online-Mode.patch | 22 ++++++++++++++++++- .../0097-Add-Conversion-Message.patch | 6 ++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch index bb1506359..17b06d5c3 100644 --- a/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0096-Treat-Bungee-as-Online-Mode.patch @@ -1,9 +1,29 @@ -From 826e45f3227d0a35f276a9326b43582a981b9732 Mon Sep 17 00:00:00 2001 +From 1525b02cdb30856230d5ae19165272804d40b2a9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:23:58 +1000 Subject: [PATCH] Treat Bungee as Online Mode +diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java +index 786c8f9..08d8714 100644 +--- a/src/main/java/net/minecraft/server/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/DedicatedServer.java +@@ -193,7 +193,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + if (!this.getOnlineMode()) { + DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); + DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); +- DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose."); ++ // Spigot start ++ if (org.spigotmc.SpigotConfig.bungee) { ++ DedicatedServer.LOGGER.warn("Whilst this makes it possible to use BungeeCord, unless access to your server is properly restricted, it also opens up the ability for hackers to connect with any username they choose."); ++ DedicatedServer.LOGGER.warn("Please see http://www.spigotmc.org/wiki/firewall-guide/ for further information."); ++ } else { ++ DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose."); ++ } ++ // Spigot end + DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file."); + } + diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java index 51bc8bd..d67539c 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java diff --git a/CraftBukkit-Patches/0097-Add-Conversion-Message.patch b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch index 759b41d65..33b04a042 100644 --- a/CraftBukkit-Patches/0097-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch @@ -1,14 +1,14 @@ -From a51267288e950cc85d7272fafe50ec4dcd3ae364 Mon Sep 17 00:00:00 2001 +From 74952c419faf58af3eb995ce081f7401f8be9e79 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 23:30:44 +1000 Subject: [PATCH] Add Conversion Message diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index b7f2382..ad4e370 100644 +index 08d8714..586de23 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -516,6 +516,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -523,6 +523,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } protected boolean aR() {