#3629: Fix scoreboard team data reading
This commit is contained in:
parent
1b88a84710
commit
2394e204fa
@ -1,5 +1,6 @@
|
|||||||
package net.md_5.bungee.protocol;
|
package net.md_5.bungee.protocol;
|
||||||
|
|
||||||
|
import java.util.function.Function;
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -31,4 +32,26 @@ public final class Either<L, R>
|
|||||||
{
|
{
|
||||||
return new Either<>( null, right );
|
return new Either<>( null, right );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public L getLeftOrCompute(Function<R, L> function)
|
||||||
|
{
|
||||||
|
if ( isLeft() )
|
||||||
|
{
|
||||||
|
return left;
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
return function.apply( right );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public R getRightOrCompute(Function<L, R> function)
|
||||||
|
{
|
||||||
|
if ( isRight() )
|
||||||
|
{
|
||||||
|
return right;
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
return function.apply( left );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -267,9 +267,9 @@ public class DownstreamBridge extends PacketHandler
|
|||||||
{
|
{
|
||||||
if ( team.getMode() == 0 || team.getMode() == 2 )
|
if ( team.getMode() == 0 || team.getMode() == 2 )
|
||||||
{
|
{
|
||||||
t.setDisplayName( ComponentSerializer.toString( team.getDisplayName() ) );
|
t.setDisplayName( team.getDisplayName().getLeftOrCompute( ComponentSerializer::toString ) );
|
||||||
t.setPrefix( ComponentSerializer.toString( team.getPrefix() ) );
|
t.setPrefix( team.getPrefix().getLeftOrCompute( ComponentSerializer::toString ) );
|
||||||
t.setSuffix( ComponentSerializer.toString( team.getSuffix() ) );
|
t.setSuffix( team.getSuffix().getLeftOrCompute( ComponentSerializer::toString ) );
|
||||||
t.setFriendlyFire( team.getFriendlyFire() );
|
t.setFriendlyFire( team.getFriendlyFire() );
|
||||||
t.setNameTagVisibility( team.getNameTagVisibility() );
|
t.setNameTagVisibility( team.getNameTagVisibility() );
|
||||||
t.setCollisionRule( team.getCollisionRule() );
|
t.setCollisionRule( team.getCollisionRule() );
|
||||||
|
Loading…
Reference in New Issue
Block a user