summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-03 11:08:35 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-03 11:08:35 +0000
commit8110f51b50d93cf5b0bbea6d5cad79b57a7fd8b4 (patch)
treefe82f5a7c71c367d076812b2e609f732f07ad448
parentdf0b4c1ca4a9d8ca3cabf24822361da0ad63af23 (diff)
downloadcraftbukkit-8110f51b50d93cf5b0bbea6d5cad79b57a7fd8b4.tar
craftbukkit-8110f51b50d93cf5b0bbea6d5cad79b57a7fd8b4.tar.gz
craftbukkit-8110f51b50d93cf5b0bbea6d5cad79b57a7fd8b4.tar.lz
craftbukkit-8110f51b50d93cf5b0bbea6d5cad79b57a7fd8b4.tar.xz
craftbukkit-8110f51b50d93cf5b0bbea6d5cad79b57a7fd8b4.zip
Minor formatting fixes
-rw-r--r--nms-patches/PlayerList.patch6
-rw-r--r--src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch
index bcf8056c..ce5cc7d7 100644
--- a/nms-patches/PlayerList.patch
+++ b/nms-patches/PlayerList.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/PlayerList.java 2014-12-02 16:38:08.513921921 +0000
-+++ src/main/java/net/minecraft/server/PlayerList.java 2014-12-02 16:37:39.357922568 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/PlayerList.java 2014-12-03 11:08:25.244137435 +0000
++++ src/main/java/net/minecraft/server/PlayerList.java 2014-12-03 11:08:02.624137937 +0000
@@ -18,6 +18,25 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -200,7 +200,7 @@
+ EntityPlayer entityplayer1 = (EntityPlayer) this.players.get(i);
+
+ if (entityplayer1.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
-+ entityplayer1.playerConnection.sendPacket(packet);
++ entityplayer1.playerConnection.sendPacket(packet);
+ } else {
+ entityplayer1.getBukkitEntity().removeDisconnectingPlayer(entityplayer.getBukkitEntity());
+ }
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
index c2d4c2e4..26ea0d3a 100644
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
@@ -45,7 +45,7 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
Server server = queuedChunk.provider.world.getServer();
if (server != null) {
- server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(chunk.bukkitChunk, false));
+ server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(chunk.bukkitChunk, false));
}
// Update neighbor counts