Rebuild patches for upstream changes

This commit is contained in:
Zach Brown 2015-02-03 17:53:51 -06:00
parent 6f8cdbf0f4
commit 00e1315f65
2 changed files with 3 additions and 7 deletions

View File

@ -26,6 +26,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.f.put(entityplayer1.getUniqueID(), entityplayer1);
}
// Added from changeDimension
--
1.9.5.msysgit.0
--

View File

@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private final IpBanList l;
@@ -0,0 +0,0 @@ public abstract class PlayerList {
public void onPlayerJoin(EntityPlayer entityplayer) {
public void onPlayerJoin(EntityPlayer entityplayer, String joinMessage) { // CraftBukkit added param
this.players.add(entityplayer);
+ this.playerMap.put(entityplayer.getName(), entityplayer); // PaperSpigot
this.f.put(entityplayer.getUniqueID(), entityplayer);
@ -170,6 +170,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
public InetSocketAddress getAddress() {
--
1.9.5.msysgit.0
--