From fc07c5efa66bcf2fe60baa3a73e63650c9fe8ec1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 5 Jul 2018 16:01:12 -0400 Subject: [PATCH] Fixed carry entity chain reaction --- core/src/io/anuke/mindustry/entities/traits/CarryTrait.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java b/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java index 9597711a38..7a3e161ff9 100644 --- a/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java @@ -32,14 +32,14 @@ public interface CarryTrait extends TeamTrait, SolidTrait, TargetTrait{ CallEntity.setCarryOf(this instanceof Player ? (Player)this : null, this, unit); } - @Remote(called = Loc.server, targets = Loc.both, forward = true, in = In.entities) + @Remote(called = Loc.both, targets = Loc.both, forward = true, in = In.entities) static void dropSelf(Player player){ if(player.getCarrier() != null){ player.getCarrier().dropCarry(); } } - @Remote(called = Loc.server, targets = Loc.both, forward = true, in = In.entities) + @Remote(called = Loc.both, targets = Loc.both, forward = true, in = In.entities) static void setCarryOf(Player player, CarryTrait trait, CarriableTrait unit){ if(player != null){ //when a server recieves this called from a player, set the carrier to the player. trait = player;