fix fake players

This commit is contained in:
gnembon committed 2019-07-07 22:50:27 -03:00
1 parent edae018d2b
commit 9e0d9840b3
3 files changed
+41 -1

No files matched your search

@@ -0,0 +1,37 @@
package carpet.mixins;
import carpet.patches.EntityPlayerMPFake;
import net.minecraft.entity.Entity;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerTask;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(ServerWorld.class)
public abstract class ServerWorld_fakePlayersDimensionChange
{
@Shadow private boolean ticking;
@Shadow /*@Nonnull*/ public abstract MinecraftServer getServer();
@Redirect( method = "removePlayer", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/server/world/ServerWorld;removeEntity(Lnet/minecraft/entity/Entity;)V"
))
private void crashRemovePlayer(ServerWorld serverWorld, Entity entity_1, ServerPlayerEntity serverPlayerEntity_1)
{
if ( !(ticking && serverPlayerEntity_1 instanceof EntityPlayerMPFake) )
serverWorld.removeEntity(entity_1);
else
getServer().method_18858(new ServerTask(getServer().getTicks(), () ->
{
serverWorld.removeEntity(serverPlayerEntity_1);
serverPlayerEntity_1.onTeleportationDone();
}));
}
}
@@ -59,6 +59,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), instance.dimension);
server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), instance.dimension);
instance.getServerWorld().method_14178().updateCameraPosition(instance);
instance.dataTracker.set(PLAYER_MODEL_BIT_MASK, (byte) 0x7f); // show all model layers (incl. capes)
return instance;
}
@@ -106,7 +107,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
this.getServerWorld().method_14178().updateCameraPosition(this);
}
super.tick();
this.method_14226();
if (!removed) this.method_14226();
}
@Override