OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-13 10:21:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5805: NPE when getting an Attribute from a Player

Browse source
This commit is contained in:
md_5 2020-06-25 13:19:24 +10:00
parent b136f8430d
commit 38de0b81e2
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
2 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
View file

@ -1,9 +1,9 @@
package org.bukkit.craftbukkit.attribute; package org.bukkit.craftbukkit.attribute;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import net.minecraft.server.AttributeBase;
import net.minecraft.server.AttributeMapBase; import net.minecraft.server.AttributeMapBase;
import net.minecraft.server.IRegistry; import net.minecraft.server.IRegistry;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry; import org.bukkit.Registry;
import org.bukkit.attribute.Attributable; import org.bukkit.attribute.Attributable;
import org.bukkit.attribute.Attribute; import org.bukkit.attribute.Attribute;
@ -21,12 +21,16 @@ public class CraftAttributeMap implements Attributable {
@Override @Override
public AttributeInstance getAttribute(Attribute attribute) { public AttributeInstance getAttribute(Attribute attribute) {
Preconditions.checkArgument(attribute != null, "attribute"); Preconditions.checkArgument(attribute != null, "attribute");
net.minecraft.server.AttributeModifiable nms = handle.a(IRegistry.ATTRIBUTE.get(CraftNamespacedKey.toMinecraft(attribute.getKey()))); net.minecraft.server.AttributeModifiable nms = handle.a(toMinecraft(attribute));
return (nms == null) ? null : new CraftAttributeInstance(nms, attribute); return (nms == null) ? null : new CraftAttributeInstance(nms, attribute);
} }
public static AttributeBase toMinecraft(Attribute attribute) {
return IRegistry.ATTRIBUTE.get(CraftNamespacedKey.toMinecraft(attribute.getKey()));
}
public static Attribute fromMinecraft(String nms) { public static Attribute fromMinecraft(String nms) {
return Registry.ATTRIBUTE.get(NamespacedKey.minecraft(nms)); return Registry.ATTRIBUTE.get(CraftNamespacedKey.fromString(nms));
} }
} }

30
src/test/java/org/bukkit/craftbukkit/attribute/AttributeTest.java Normal file
View file

@ -0,0 +1,30 @@
package org.bukkit.craftbukkit.attribute;
import net.minecraft.server.AttributeBase;
import net.minecraft.server.IRegistry;
import net.minecraft.server.MinecraftKey;
import org.bukkit.attribute.Attribute;
import org.bukkit.support.AbstractTestingBase;
import org.junit.Assert;
import org.junit.Test;
public class AttributeTest extends AbstractTestingBase {
@Test
public void testToBukkit() {
for (MinecraftKey nms : IRegistry.ATTRIBUTE.keySet()) {
Attribute bukkit = CraftAttributeMap.fromMinecraft(nms.toString());
Assert.assertNotNull(nms.toString(), bukkit);
}
}
@Test
public void testToNMS() {
for (Attribute attribute : Attribute.values()) {
AttributeBase nms = CraftAttributeMap.toMinecraft(attribute);
Assert.assertNotNull(attribute.name(), nms);
}
}
}