fix end transfer deleting capability data

This commit is contained in:
yrsegal@gmail.com 2022-04-08 19:10:18 -04:00
parent baac41e151
commit 9a360fd17d

View file

@ -69,28 +69,26 @@ public class HexCapabilities {
return; return;
} }
if (evt.isWasDeath()) { var proto = evt.getOriginal();
var proto = evt.getOriginal(); // Copy caps from this to new player
// Copy caps from this to new player proto.reviveCaps();
proto.reviveCaps(); var protoCapSentinel = proto.getCapability(SENTINEL).resolve();
var protoCapSentinel = proto.getCapability(SENTINEL).resolve(); protoCapSentinel.ifPresent(protoSentinel -> {
protoCapSentinel.ifPresent(protoSentinel -> { var capSentinel = player.getCapability(SENTINEL);
var capSentinel = player.getCapability(SENTINEL); capSentinel.ifPresent(sentinel -> {
capSentinel.ifPresent(sentinel -> { sentinel.hasSentinel = protoSentinel.hasSentinel;
sentinel.hasSentinel = protoSentinel.hasSentinel; sentinel.position = protoSentinel.position;
sentinel.position = protoSentinel.position; sentinel.extendsRange = protoSentinel.extendsRange;
sentinel.extendsRange = protoSentinel.extendsRange;
});
}); });
var protoCapColor = proto.getCapability(PREFERRED_COLORIZER).resolve(); });
protoCapColor.ifPresent(protoColorizer -> { var protoCapColor = proto.getCapability(PREFERRED_COLORIZER).resolve();
var capColorizer = player.getCapability(PREFERRED_COLORIZER); protoCapColor.ifPresent(protoColorizer -> {
capColorizer.ifPresent(colorizer -> { var capColorizer = player.getCapability(PREFERRED_COLORIZER);
colorizer.colorizer = protoColorizer.colorizer; capColorizer.ifPresent(colorizer -> {
}); colorizer.colorizer = protoColorizer.colorizer;
}); });
proto.invalidateCaps(); });
} proto.invalidateCaps();
} }
@SubscribeEvent @SubscribeEvent