Properly fix missing attribute issue, add vanilla bug ID
This commit is contained in:
parent
185ce79a68
commit
3dce85c49f
|
@ -96,7 +96,7 @@
|
||||||
IAttributeInstance iattributeinstance = abstractattributemap.func_111152_a(sentitypropertiespacket$snapshot.func_151409_a());
|
IAttributeInstance iattributeinstance = abstractattributemap.func_111152_a(sentitypropertiespacket$snapshot.func_151409_a());
|
||||||
if (iattributeinstance == null) {
|
if (iattributeinstance == null) {
|
||||||
- iattributeinstance = abstractattributemap.func_111150_b(new RangedAttribute((IAttribute)null, sentitypropertiespacket$snapshot.func_151409_a(), 0.0D, Double.MIN_NORMAL, Double.MAX_VALUE));
|
- iattributeinstance = abstractattributemap.func_111150_b(new RangedAttribute((IAttribute)null, sentitypropertiespacket$snapshot.func_151409_a(), 0.0D, Double.MIN_NORMAL, Double.MAX_VALUE));
|
||||||
+ iattributeinstance = abstractattributemap.func_111150_b(new RangedAttribute((IAttribute)null, sentitypropertiespacket$snapshot.func_151409_a(), 0.0D, Double.MIN_VALUE, Double.MAX_VALUE)); // FORGE: Fix vanilla typo, MIN_NORMAL -> MIN_VALUE
|
+ iattributeinstance = abstractattributemap.func_111150_b(new RangedAttribute((IAttribute)null, sentitypropertiespacket$snapshot.func_151409_a(), 0.0D, -Double.MAX_VALUE, Double.MAX_VALUE)); // FORGE: fix invalid value range (MC-150405)
|
||||||
}
|
}
|
||||||
|
|
||||||
iattributeinstance.func_111128_a(sentitypropertiespacket$snapshot.func_151410_b());
|
iattributeinstance.func_111128_a(sentitypropertiespacket$snapshot.func_151410_b());
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
--- a/net/minecraft/util/registry/Registry.java
|
--- a/net/minecraft/util/registry/Registry.java
|
||||||
+++ b/net/minecraft/util/registry/Registry.java
|
+++ b/net/minecraft/util/registry/Registry.java
|
||||||
@@ -62,80 +62,83 @@
|
@@ -66,76 +66,78 @@
|
||||||
import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
|
|
||||||
import net.minecraftforge.api.distmarker.Dist;
|
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
||||||
+
|
|
||||||
import org.apache.commons.lang3.Validate;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
@ -107,7 +102,7 @@
|
||||||
public static final Registry<IStructurePieceType> field_218362_C = func_222935_a("structure_piece", () -> {
|
public static final Registry<IStructurePieceType> field_218362_C = func_222935_a("structure_piece", () -> {
|
||||||
return IStructurePieceType.field_214782_c;
|
return IStructurePieceType.field_214782_c;
|
||||||
});
|
});
|
||||||
@@ -148,37 +151,37 @@
|
@@ -148,37 +150,37 @@
|
||||||
public static final Registry<IJigsawDeserializer> field_218365_F = func_222935_a("structure_pool_element", () -> {
|
public static final Registry<IJigsawDeserializer> field_218365_F = func_222935_a("structure_pool_element", () -> {
|
||||||
return IJigsawDeserializer.field_214931_e;
|
return IJigsawDeserializer.field_214931_e;
|
||||||
});
|
});
|
||||||
|
@ -154,7 +149,7 @@
|
||||||
return Activity.field_221366_b;
|
return Activity.field_221366_b;
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -230,6 +233,14 @@
|
@@ -230,6 +232,14 @@
|
||||||
return ((MutableRegistry<T>)p_218343_0_).func_218382_a(p_218343_1_, new ResourceLocation(p_218343_2_), p_218343_3_);
|
return ((MutableRegistry<T>)p_218343_0_).func_218382_a(p_218343_1_, new ResourceLocation(p_218343_2_), p_218343_3_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -72,8 +72,6 @@
|
||||||
"fml.messages.version.restriction.bounded.lowerexclusive":"above {0}, and {1} or below",
|
"fml.messages.version.restriction.bounded.lowerexclusive":"above {0}, and {1} or below",
|
||||||
"fml.messages.version.restriction.bounded.upperexclusive":"{0} or above, and below {1}",
|
"fml.messages.version.restriction.bounded.upperexclusive":"{0} or above, and below {1}",
|
||||||
|
|
||||||
"structure.notFound": "Unknown structure: %s",
|
|
||||||
|
|
||||||
"commands.forge.dimensions.list": "Currently registered dimensions by type:",
|
"commands.forge.dimensions.list": "Currently registered dimensions by type:",
|
||||||
"commands.forge.entity.list.invalid": "Invalid filter, does not match any entities. Use /forge entity list for a proper list",
|
"commands.forge.entity.list.invalid": "Invalid filter, does not match any entities. Use /forge entity list for a proper list",
|
||||||
"commands.forge.entity.list.invalidworld": "Could not load world for dimension {0}. Please select a valid dimension.",
|
"commands.forge.entity.list.invalidworld": "Could not load world for dimension {0}. Please select a valid dimension.",
|
||||||
|
|
Loading…
Reference in New Issue