From a7b882a7d726785aefa44b5f4689aad7087cc218 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Mon, 20 Jun 2016 18:08:37 -0700 Subject: [PATCH] Fix #183. --- src/main/java/org/spacehq/mc/protocol/data/MagicValues.java | 4 ++-- .../mc/protocol/data/game/scoreboard/CollisionRule.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java b/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java index 0f1e9ce9..d6310b60 100644 --- a/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java +++ b/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java @@ -708,8 +708,8 @@ public class MagicValues { register(CollisionRule.ALWAYS, "always"); register(CollisionRule.NEVER, "never"); - register(CollisionRule.HIDE_FOR_OTHER_TEAMS, "hideForOtherTeams"); - register(CollisionRule.HIDE_FOR_OWN_TEAM, "hideForOwnTeam"); + register(CollisionRule.PUSH_OTHER_TEAMS, "pushOtherTeams"); + register(CollisionRule.PUSH_OWN_TEAM, "pushOwnTeam"); register(TeamColor.NONE, -1); register(TeamColor.BLACK, 0); diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/scoreboard/CollisionRule.java b/src/main/java/org/spacehq/mc/protocol/data/game/scoreboard/CollisionRule.java index 8b1f688c..6e6d741c 100644 --- a/src/main/java/org/spacehq/mc/protocol/data/game/scoreboard/CollisionRule.java +++ b/src/main/java/org/spacehq/mc/protocol/data/game/scoreboard/CollisionRule.java @@ -1,10 +1,8 @@ package org.spacehq.mc.protocol.data.game.scoreboard; public enum CollisionRule { - ALWAYS, NEVER, - HIDE_FOR_OTHER_TEAMS, - HIDE_FOR_OWN_TEAM; - + PUSH_OTHER_TEAMS, + PUSH_OWN_TEAM; }