diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index dd82cb32b..b1906046a 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -229,7 +229,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void chat(String msg) {
         if (getHandle().netServerHandler == null) return;
 
-        getHandle().netServerHandler.chat(msg);
+        getHandle().netServerHandler.chat(msg, false);
     }
 
     public boolean performCommand(String command) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyHashSet.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyHashSet.java
new file mode 100644
index 000000000..ad83fd87d
--- /dev/null
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyHashSet.java
@@ -0,0 +1,98 @@
+package org.bukkit.craftbukkit.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+
+public abstract class LazyHashSet<E> implements Set<E> {
+    Set<E> reference = null;
+
+    public int size() {
+        return getReference().size();
+    }
+
+    public boolean isEmpty() {
+        return getReference().isEmpty();
+    }
+
+    public boolean contains(Object o) {
+        return getReference().contains(o);
+    }
+
+    public Iterator<E> iterator() {
+        return getReference().iterator();
+    }
+
+    public Object[] toArray() {
+        return getReference().toArray();
+    }
+
+    public <T> T[] toArray(T[] a) {
+        return getReference().toArray(a);
+    }
+
+    public boolean add(E o) {
+        return getReference().add(o);
+    }
+
+    public boolean remove(Object o) {
+        return getReference().remove(o);
+    }
+
+    public boolean containsAll(Collection<?> c) {
+        return getReference().containsAll(c);
+    }
+
+    public boolean addAll(Collection<? extends E> c) {
+        return getReference().addAll(c);
+    }
+
+    public boolean retainAll(Collection<?> c) {
+        return getReference().retainAll(c);
+    }
+
+    public boolean removeAll(Collection<?> c) {
+        return getReference().removeAll(c);
+    }
+
+    public void clear() {
+        getReference().clear();
+    }
+
+    public Set<E> getReference() {
+        Set<E> reference = this.reference ;
+        if (reference != null) {
+            return reference;
+        }
+        return this.reference = makeReference();
+    }
+
+    abstract Set<E> makeReference();
+
+    public boolean isLazy() {
+        return reference == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return 157 * getReference().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        }
+        if (obj == null || this.getClass() != obj.getClass()) {
+            return false;
+        }
+        LazyHashSet<?> that = (LazyHashSet<?>) obj;
+        return (this.isLazy() && that.isLazy()) || this.getReference().equals(that.getReference());
+    }
+
+    @Override
+    public String toString() {
+        return getReference().toString();
+    }
+}
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java
new file mode 100644
index 000000000..df0901905
--- /dev/null
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java
@@ -0,0 +1,25 @@
+package org.bukkit.craftbukkit.util;
+
+import java.util.HashSet;
+import java.util.List;
+import net.minecraft.server.EntityPlayer;
+import net.minecraft.server.MinecraftServer;
+
+import org.bukkit.entity.Player;
+
+public class LazyPlayerSet extends LazyHashSet<Player> {
+
+    @Override
+    HashSet<Player> makeReference() {
+        if (reference != null) {
+            throw new IllegalStateException("Reference already created!");
+        }
+        List<EntityPlayer> players = MinecraftServer.getServer().getServerConfigurationManager().players;
+        HashSet<Player> reference = new HashSet<Player>(players.size());
+        for (EntityPlayer player : players) {
+            reference.add(player.getBukkitEntity());
+        }
+        return reference;
+    }
+
+}