diff options
| author | md_5 <git@md-5.net> | 2015-06-06 19:33:48 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-06-06 19:46:42 +1000 |
| commit | a65e45d889c1f040e1921eb84903af915df512db (patch) | |
| tree | 74ff87413ffc36de8640085c6b611b554a55b144 /nms-patches/PlayerList.patch | |
| parent | a6a57a96d02e57264d45120ce9f272c18c64407a (diff) | |
| download | craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.tar craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.tar.gz craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.tar.lz craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.tar.xz craftbukkit-a65e45d889c1f040e1921eb84903af915df512db.zip | |
[SPIGOT-946] Begin making use of access transforms to simplify patching.
Diffstat (limited to 'nms-patches/PlayerList.patch')
| -rw-r--r-- | nms-patches/PlayerList.patch | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch index 5ebf6bd6..28ca82c0 100644 --- a/nms-patches/PlayerList.patch +++ b/nms-patches/PlayerList.patch @@ -27,23 +27,15 @@ public abstract class PlayerList { public static final File a = new File("banned-players.json"); -@@ -27,14 +47,14 @@ +@@ -27,7 +47,7 @@ private static final Logger f = LogManager.getLogger(); private static final SimpleDateFormat g = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z"); private final MinecraftServer server; -- private final List<EntityPlayer> players = Lists.newArrayList(); -+ public final List<EntityPlayer> players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety, public +- public final List<EntityPlayer> players = Lists.newArrayList(); ++ public final List<EntityPlayer> players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety private final Map<UUID, EntityPlayer> j = Maps.newHashMap(); private final GameProfileBanList k; private final IpBanList l; - private final OpList operators; - private final WhiteList whitelist; - private final Map<UUID, ServerStatisticManager> o; -- private IPlayerFileData playerFileData; -+ public IPlayerFileData playerFileData; // CraftBukkit - public - private boolean hasWhitelist; - protected int maxPlayers; - private int r; @@ -42,7 +62,15 @@ private boolean t; private int u; @@ -121,7 +113,7 @@ playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch); this.b(entityplayer, worldserver); if (this.server.getResourcePack().length() > 0) { -@@ -126,9 +168,11 @@ +@@ -126,6 +168,8 @@ } } @@ -129,11 +121,7 @@ + PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")"); } -- protected void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) { -+ public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) { // CraftBukkit - public - HashSet hashset = Sets.newHashSet(); - Iterator iterator = scoreboardserver.getTeams().iterator(); - + public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) { @@ -158,6 +202,7 @@ } |