Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-06-02 11:59:38 -03:00
commit b5e34ad030
14 files changed
+431 -63

No files matched your search

@@ -2704,7 +2704,7 @@ public class CarpetExpression
ServerPlayerEntity player = null;
if (params.containsKey("player"))
{
player = (ServerPlayerEntity) ((EntityValue)params.get("player")).getEntity();
player = (ServerPlayerEntity)((EntityValue)params.get("player")).getEntity();
}
ShapeDispatcher.sendShape(
(player==null)?cc.s.getWorld().getPlayers():Collections.singletonList(player),