fix flight being revoked after death, 1.5.1

Draylar · Jul 31, 2020 · 5caea2c · 5caea2c
1 parent 79acf85
commit 5caea2c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings=1.16.1+build.21
 loader_version=0.9.0+build.204
 
 # Mod Properties
-mod_version=1.5.0
+mod_version=1.5.1
 maven_group=draylar
 archives_base_name=identity
 

diff --git a/src/main/java/draylar/identity/cca/IdentityComponent.java b/src/main/java/draylar/identity/cca/IdentityComponent.java
@@ -97,14 +97,6 @@ else if (type.isPresent()) {
 
                     // refresh player dimensions/hitbox on client
                     ((DimensionsRefresher) player).refresh();
-
-                    // refresh flight abilities
-                    // TODO remove when compatibility with old saves is no longer needed
-                    if(!player.world.isClient) {
-                        if (Identity.hasFlyingPermissions((ServerPlayerEntity) player)) {
-                            Identity.ABILITY_SOURCE.grantTo(player, VanillaAbilities.ALLOW_FLYING);
-                        }
-                    }
                 }
 
                 identity.fromTag(entityTag);

diff --git a/src/main/java/draylar/identity/mixin/ServerPlayerEntityMixin.java b/src/main/java/draylar/identity/mixin/ServerPlayerEntityMixin.java
@@ -2,6 +2,7 @@
 
 import draylar.identity.Identity;
 import draylar.identity.registry.Components;
+import io.github.ladysnake.pal.VanillaAbilities;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.damage.DamageSource;
@@ -50,4 +51,18 @@ private void revokeIdentityOnDeath(DamageSource source, CallbackInfo ci) {
             }
         }
     }
+
+    @Inject(
+            method = "onSpawn",
+            at = @At("HEAD")
+    )
+    private void onSpawn(CallbackInfo ci) {
+        if(Identity.hasFlyingPermissions((ServerPlayerEntity) (Object) this)) {
+            if(!Identity.ABILITY_SOURCE.grants((ServerPlayerEntity) (Object) this, VanillaAbilities.ALLOW_FLYING)) {
+                Identity.ABILITY_SOURCE.grantTo((ServerPlayerEntity) (Object) this, VanillaAbilities.ALLOW_FLYING);
+            }
+
+            Identity.ABILITY_SOURCE.grantTo((ServerPlayerEntity) (Object) this, VanillaAbilities.FLYING);
+        }
+    }
 }