SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix player leak from entity tracker and item frames

Browse Source 
3005a20c5c
This commit is contained in:
Jedediah Smith
2015-12-22 21:55:00 -06:00
parent 10316338d8
commit 1bd859fad5
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch
View File

@@ -9,10 +9,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -0,0 +0,0 @@ public class EntityTrackerEntry { @@ -0,0 +0,0 @@ public class EntityTrackerEntry {
private boolean x;
private boolean y; private boolean y;
public boolean n; public boolean n;
public Set<EntityPlayer> trackedPlayers = Sets.newHashSet(); - public Set<EntityPlayer> trackedPlayers = Sets.newHashSet();
+ public Set<EntityPlayer> freshViewers = Sets.newHashSet(); // PaperSpigot + // PaperSpigot start
+ // Replace trackedPlayers Set with a Map. The value is true until the player receives
+ // their first update (which is forced to have absolute coordinates), false afterward.
+ public java.util.Map<EntityPlayer, Boolean> trackedPlayerMap = new java.util.HashMap<EntityPlayer, Boolean>();
+ public Set<EntityPlayer> trackedPlayers = trackedPlayerMap.keySet();
+ // PaperSpigot end
public EntityTrackerEntry(Entity entity, int i, int j, boolean flag) { public EntityTrackerEntry(Entity entity, int i, int j, boolean flag) {
this.tracker = entity; this.tracker = entity;
@@ -26,7 +32,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- this.yLoc = j; - this.yLoc = j;
- this.zLoc = k; - this.zLoc = k;
- } - }
+ if (this.m > 0 || this.tracker instanceof EntityArrow) { // PaperSpigot - Move up + if (this.m > 0 || this.tracker instanceof EntityArrow) { // PaperSpigot - Moved up
+ // CraftBukkit start - Code moved from below + // CraftBukkit start - Code moved from below
+ if (flag) { + if (flag) {
+ this.xLoc = i; + this.xLoc = i;
@@ -59,18 +65,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (object instanceof PacketPlayOutEntityTeleport) { + if (object instanceof PacketPlayOutEntityTeleport) {
+ this.broadcast((Packet) object); + this.broadcast((Packet) object);
+ } else { + } else {
+ PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(this.tracker.getId(), i, j, k, (byte) l, (byte) i1, this.tracker.onGround); + PacketPlayOutEntityTeleport teleportPacket = null;
+ +
+ for (EntityPlayer viewer : (Set<EntityPlayer>) this.trackedPlayers) { + for (java.util.Map.Entry<EntityPlayer, Boolean> viewer : trackedPlayerMap.entrySet()) {
+ if (this.freshViewers.contains(viewer)) { + if (viewer.getValue()) {
+ viewer.playerConnection.sendPacket(teleportPacket); + viewer.setValue(false);
+ if (teleportPacket == null) {
+ teleportPacket = new PacketPlayOutEntityTeleport(this.tracker.getId(), i, j, k, (byte) l, (byte) i1, this.tracker.onGround);
+ }
+ viewer.getKey().playerConnection.sendPacket(teleportPacket);
+ } else { + } else {
+ viewer.playerConnection.sendPacket((Packet) object); + viewer.getKey().playerConnection.sendPacket((Packet) object);
+ } + }
+ } + }
+ } + }
+
+ this.freshViewers.clear();
+ // PaperSpigot end + // PaperSpigot end
} }
@@ -79,8 +87,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
entityplayer.removeQueue.remove(Integer.valueOf(this.tracker.getId())); entityplayer.removeQueue.remove(Integer.valueOf(this.tracker.getId()));
// CraftBukkit end // CraftBukkit end
+ this.freshViewers.add(entityplayer); // PaperSpigot - this.trackedPlayers.add(entityplayer);
this.trackedPlayers.add(entityplayer); + this.trackedPlayerMap.put(entityplayer, true); // PaperBukkit
Packet packet = this.c(); Packet packet = this.c();
entityplayer.playerConnection.sendPacket(packet);
-- --