From 9a995d75b30a1cbdfadeb57a7bd0e8e538829cca Mon Sep 17 00:00:00 2001 From: gamma-delta <29877714+gamma-delta@users.noreply.github.com> Date: Mon, 7 Feb 2022 19:34:56 -0600 Subject: [PATCH] really fix flight and more colorizers --- contributors.toml | 10 +++++++++- .../common/casting/operators/spells/great/OpFlight.kt | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/contributors.toml b/contributors.toml index 800d6304..28fc2fc9 100644 --- a/contributors.toml +++ b/contributors.toml @@ -29,6 +29,7 @@ colorizer = [9609727, 7045119] # Hubry ["b0a26f6b-d951-4b65-b824-b164b9bc4b90"] +# 0x10e810, 0xe97dff, 0x33ffff colorizer = [1107984, 15302143, 3407871] # Dev (the forge dummy player) @@ -69,10 +70,17 @@ colorizer = [13568650] # ff3939 ffd543 fffc43 ffffe3 colorizer = [16726329, 16766275, 16776259, 16777187] -# WildOats +# WildOats (stevebutnottoomanypeoplehaveit) ["968e572c-a6c1-4963-8399-0c64abd3820e"] +# 5f118a 411db8 colorizer = [6230410, 4267448] +# taswin +["816bedca-0bfa-4239-8b36-d234463b9c33"] +# 0x800300, 0x5f5f5f +colorizer = [8389376, 6250335] + # Todo: # taswin # MacyMacerator +# artemisSystem diff --git a/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpFlight.kt b/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpFlight.kt index fae52f35..af095b06 100644 --- a/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpFlight.kt +++ b/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpFlight.kt @@ -59,6 +59,7 @@ object OpFlight : SpellOperator { target.abilities.mayfly = true target.abilities.flying = true + target.onUpdateAbilities() // Launch the player into the air to really emphasize the flight HexMessages.getNetwork() .send(PacketDistributor.PLAYER.with { target }, MsgAddMotionAck(Vec3(0.0, 1.0, 0.0))) @@ -114,12 +115,14 @@ object OpFlight : SpellOperator { if (cap.flightTime < 0 || cap.origin.distanceToSqr(entity.position()) > cap.radius * cap.radius) { if (!entity.isOnGround) { entity.fallDistance = 1_000_000f + /* val move = entity.deltaMovement HexMessages.getNetwork() .send( PacketDistributor.PLAYER.with { entity }, MsgAddMotionAck(Vec3(0.0, -move.y - 100.0, 0.0)) ) + */ } cap.allowed = false