PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-17 10:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed broken players when a passenger disconnects whilst being carried

Browse source
This commit is contained in:
Sollace 2023-08-09 17:53:05 +01:00
parent cd0a58f27f
commit 622ffa31de
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
2 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/com/minelittlepony/unicopia/mixin/MixinPlayerManager.java Normal file
View file

@ -0,0 +1,37 @@
package com.minelittlepony.unicopia.mixin;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.minelittlepony.unicopia.entity.player.Pony;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.PlayerManager;
import net.minecraft.server.network.ServerPlayerEntity;
@Mixin(PlayerManager.class)
abstract class MixinPlayerManager {
@Inject(method = "remove", at = @At("HEAD"))
public void onRemove(ServerPlayerEntity player, CallbackInfo info) {
player.getPassengerList().stream()
.flatMap(passenger -> Pony.of(passenger).stream())
.forEach(passenger -> passenger.setCarrier((Entity)null));
player.removeAllPassengers();
@Nullable
Entity vehicle = null;
if (player.hasVehicle() && (vehicle = player.getRootVehicle()).hasPlayerRider()) {
if (vehicle.streamPassengersAndSelf().anyMatch(e -> {
return e != player && e instanceof PlayerEntity;
})) {
player.stopRiding();
Pony.of(player).setCarrier((Entity)null);
}
}
}
}

1
src/main/resources/unicopia.mixin.json
View file

@ -28,6 +28,7 @@
"MixinPersistentProjectileEntity",
"MixinPlayerEntity",
"MixinPlayerInventory",
"MixinPlayerManager",
"MixinPowderSnowBlock",
"MixinProjectileEntity",
"MixinServerPlayerEntity",