[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.
This commit is contained in:
parent
ac12a97076
commit
e665cd9936
1 changed files with 14 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
|||
From 60f343f96680e16473292b298dac3b712c6ad852 Mon Sep 17 00:00:00 2001
|
||||
From 3d58bb7e7759377a0a59a8cf388372f8918dea2f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 30 Mar 2016 19:36:20 -0400
|
||||
Subject: [PATCH] MC Dev fixes
|
||||
|
@ -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
|
||||
@@ -135,8 +135,4 @@ 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
|
||||
|
|
Loading…
Reference in a new issue