|
31 | 31 | import static com.earth2me.essentials.I18n.tl; |
32 | 32 |
|
33 | 33 | public class EssentialsSign { |
| 34 | + private static final String SIGN_OWNER_KEY = "sign-owner"; |
34 | 35 | protected static final BigDecimal MINTRANSACTION = new BigDecimal("0.01"); |
35 | 36 | private static final Set<Material> EMPTY_SET = new HashSet<>(); |
36 | 37 | protected transient final String signName; |
@@ -166,19 +167,20 @@ public void setOwnerData(final IEssentials ess, final User user, final ISign sig |
166 | 167 | return; |
167 | 168 | } |
168 | 169 | final Sign sign = (Sign) signProvider.getBlock().getState(); |
169 | | - ess.getSignDataProvider().setSignData(sign, "owner", user.getUUID().toString()); |
| 170 | + ess.getSignDataProvider().setSignData(sign, SIGN_OWNER_KEY, user.getUUID().toString()); |
170 | 171 | } |
171 | 172 |
|
172 | 173 | public boolean isOwner(final IEssentials ess, final User user, final ISign signProvider, final int nameIndex, final String namePrefix) { |
173 | 174 | final Sign sign = (Sign) signProvider.getBlock().getState(); |
174 | | - if (ess.getSignDataProvider() == null || ess.getSignDataProvider().getSignData(sign, "owner") == null) { |
175 | | - if (ess.getSignDataProvider() != null) { |
176 | | - ess.getSignDataProvider().setSignData(sign, "owner", user.getUUID().toString()); |
| 175 | + if (ess.getSignDataProvider() == null || ess.getSignDataProvider().getSignData(sign, SIGN_OWNER_KEY) == null) { |
| 176 | + final boolean isLegacyOwner = FormatUtil.stripFormat(signProvider.getLine(nameIndex)).equalsIgnoreCase(getUsername(user)); |
| 177 | + if (ess.getSignDataProvider() != null && isLegacyOwner) { |
| 178 | + ess.getSignDataProvider().setSignData(sign, SIGN_OWNER_KEY, user.getUUID().toString()); |
177 | 179 | } |
178 | | - return FormatUtil.stripFormat(signProvider.getLine(nameIndex)).equalsIgnoreCase(getUsername(user)); |
| 180 | + return isLegacyOwner; |
179 | 181 | } |
180 | 182 |
|
181 | | - if (user.getUUID().toString().equals(ess.getSignDataProvider().getSignData(sign, "owner"))) { |
| 183 | + if (user.getUUID().toString().equals(ess.getSignDataProvider().getSignData(sign, SIGN_OWNER_KEY))) { |
182 | 184 | signProvider.setLine(nameIndex, namePrefix + getUsername(user)); |
183 | 185 | return true; |
184 | 186 | } |
|
0 commit comments