From f117b03073c3549fe079b349024d841e26381f87 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Aug 2018 13:48:31 -0400 Subject: [PATCH] [CI-SKIP] Fix duplicate getServer() method in DedicatedPlayerList This causes CraftServer to show as an error state and other files too.. It's driving me nuts. --- Spigot-Server-Patches/MC-Dev-fixes.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Spigot-Server-Patches/MC-Dev-fixes.patch b/Spigot-Server-Patches/MC-Dev-fixes.patch index 4a1a1eeeae..808426632f 100644 --- a/Spigot-Server-Patches/MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/MC-Dev-fixes.patch @@ -71,6 +71,19 @@ index 650ef14758..35aea4829f 100644 this.emittedLight = new NibbleArray(); if (flag) { this.skyLight = new NibbleArray(); +diff --git a/src/main/java/net/minecraft/server/DedicatedPlayerList.java b/src/main/java/net/minecraft/server/DedicatedPlayerList.java +index 4997255c79..a5545bd4c4 100644 +--- a/src/main/java/net/minecraft/server/DedicatedPlayerList.java ++++ b/src/main/java/net/minecraft/server/DedicatedPlayerList.java +@@ -0,0 +0,0 @@ public class DedicatedPlayerList extends PlayerList { + public boolean f(GameProfile gameprofile) { + return this.getOPs().b(gameprofile); + } +- +- public MinecraftServer getServer() { +- return this.getServer(); +- } + } diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java index a661789c1e..785a1a2184 100644 --- a/src/main/java/net/minecraft/server/DefinedStructure.java