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

Update from upstream SpigotMC

Browse Source 
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
This commit is contained in:
Zach Brown
2014-08-18 10:43:17 -05:00
parent 706fab83cd
commit b742f7a892
122 changed files with 7 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CraftBukkit-Patches/0167-Fix-missed-diff-from-Minecraft-1.3.1-update.patch Normal file
View File

@@ -0,0 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Thu, 31 Jul 2014 20:05:06 -0500
Subject: [PATCH] Fix missed diff from Minecraft 1.3.1 update
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -0,0 +0,0 @@ public class PlayerChunkMap {
this.a(pair.x, pair.z, true).a(entityplayer);
}
- if (i1 > 1 || i1 < -1 || j1 > 1 || j1 < -1) {
+ if (j1 > 1 || j1 < -1 || k1 > 1 || k1 < -1) { // Spigot - missed diff
Collections.sort(entityplayer.chunkCoordIntPairQueue, new ChunkCoordComparator(entityplayer));
}
// CraftBukkit end
--