Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
#	src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
This commit is contained in:
gnembon committed 2020-04-13 01:08:06 -03:00
commit 7ebc96106b
26 files changed
+354 -83

No files matched your search

@@ -296,6 +296,14 @@ public class PlayerCommand
Messenger.m(context.getSource(), "r Cannot shadow fake players");
return 0;
}
ServerPlayerEntity sendingPlayer = null;
try
{
sendingPlayer = context.getSource().getPlayer();
}
catch (CommandSyntaxException ignored) { }
if (sendingPlayer!=player && cantManipulate(context)) return 0;
EntityPlayerMPFake.createShadow(player.server, player);
return 1;
}