CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild patches for upstream changes

Browse Source
This commit is contained in:
Zach 2015-02-03 17:53:51 -06:00
parent b22a02ec14
commit 3d0e742fab
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch
View File

@ -1,14 +1,14 @@
From 5e437f19ad25e1bf79d005085db0a007387b23e0 Mon Sep 17 00:00:00 2001
From c656076db1fe048b6cdf6d44901eeba891ee4b6f Mon Sep 17 00:00:00 2001
From: T00thpick1 <t00thpick1dirko@gmail.com>
Date: Fri, 28 Nov 2014 01:25:45 -0600
Subject: [PATCH] Do not remove player in world change
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 3fabad4..c4b11c9 100644
index 4728192..63fc029 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -465,7 +465,7 @@ public abstract class PlayerList {
@@ -468,7 +468,7 @@ public abstract class PlayerList {
entityplayer.u().getTracker().untrackPlayer(entityplayer);
// entityplayer.u().getTracker().untrackEntity(entityplayer); // CraftBukkit
entityplayer.u().getPlayerChunkMap().removePlayer(entityplayer);
@ -17,7 +17,7 @@ index 3fabad4..c4b11c9 100644
this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
BlockPosition blockposition = entityplayer.getBed();
boolean flag1 = entityplayer.isRespawnForced();
@@ -559,7 +559,7 @@ public abstract class PlayerList {
@@ -562,7 +562,7 @@ public abstract class PlayerList {
if (!entityplayer.playerConnection.isDisconnected()) {
worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
worldserver.addEntity(entityplayer1);
@ -27,5 +27,5 @@ index 3fabad4..c4b11c9 100644
}
// Added from changeDimension
--
1.9.5.msysgit.0
2.2.2

18
Spigot-Server-Patches/0034-Player-lookup-improvements.patch
View File

@ -1,4 +1,4 @@
From 52caa9f8039d91a671e1cba1bf2ccf4ab487ed0d Mon Sep 17 00:00:00 2001
From 11019ca48ca7b1da8d1d45a843eeb9476d947f0c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 13:43:11 -0600
Subject: [PATCH] Player lookup improvements
@ -13,7 +13,7 @@ By using a map based approach for player lookups, player lookup should
be consistent in performance regardless of how many players are online.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c4b11c9..cc2cc30 100644
index 63fc029..62bdb70 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -49,6 +49,31 @@ public abstract class PlayerList {
@ -48,15 +48,15 @@ index c4b11c9..cc2cc30 100644
public final Map f = Maps.newHashMap();
private final GameProfileBanList k;
private final IpBanList l;
@@ -254,6 +279,7 @@ public abstract class PlayerList {
@@ -257,6 +282,7 @@ 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);
// this.sendAll(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer})); // CraftBukkit - replaced with loop below
WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
@@ -325,6 +351,7 @@ public abstract class PlayerList {
@@ -328,6 +354,7 @@ public abstract class PlayerList {
worldserver.kill(entityplayer);
worldserver.getPlayerChunkMap().removePlayer(entityplayer);
this.players.remove(entityplayer);
@ -64,7 +64,7 @@ index c4b11c9..cc2cc30 100644
this.f.remove(entityplayer.getUniqueID());
this.o.remove(entityplayer.getUniqueID());
// CraftBukkit start
@@ -356,6 +383,8 @@ public abstract class PlayerList {
@@ -359,6 +386,8 @@ public abstract class PlayerList {
EntityPlayer entityplayer;
@ -73,7 +73,7 @@ index c4b11c9..cc2cc30 100644
for (int i = 0; i < this.players.size(); ++i) {
entityplayer = (EntityPlayer) this.players.get(i);
if (entityplayer.getUniqueID().equals(uuid)) {
@@ -367,6 +396,8 @@ public abstract class PlayerList {
@@ -370,6 +399,8 @@ public abstract class PlayerList {
while (iterator.hasNext()) {
entityplayer = (EntityPlayer) iterator.next();
@ -82,7 +82,7 @@ index c4b11c9..cc2cc30 100644
savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
entityplayer.playerConnection.disconnect("You logged in from another location");
}
@@ -958,6 +989,7 @@ public abstract class PlayerList {
@@ -961,6 +992,7 @@ public abstract class PlayerList {
}
public EntityPlayer getPlayer(String s) {
@ -171,5 +171,5 @@ index 0c9f241..e7c61fd 100644
public InetSocketAddress getAddress() {
--
1.9.5.msysgit.0
2.2.2