keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix some typos in cherry-picked commits

This commit is contained in:
tterrag 2019-04-13 09:47:33 -04:00
parent c33cd678f0
commit 3560e47a77
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
patches/minecraft/net/minecraft/entity/monster/EntityZombieVillager.java.patch
View File

@ -32,15 +32,16 @@
if (p_70037_1_.func_150297_b("ConversionTime", 99) && p_70037_1_.func_74762_e("ConversionTime") > -1) {
this.func_191991_a(p_70037_1_.func_186855_b("ConversionPlayer") ? p_70037_1_.func_186857_a("ConversionPlayer") : null, p_70037_1_.func_74762_e("ConversionTime"));
}
@@ -77,6 +85,7 @@
@@ -76,7 +84,7 @@
@Nullable
public IEntityLivingData func_204210_a(DifficultyInstance p_204210_1_, @Nullable IEntityLivingData p_204210_2_, @Nullable NBTTagCompound p_204210_3_) {
this.func_190733_a(this.field_70170_p.field_73012_v.nextInt(6));
- this.func_190733_a(this.field_70170_p.field_73012_v.nextInt(6));
+ net.minecraftforge.fml.common.registry.VillagerRegistry.setRandomProfession(this, this.field_70170_p.field_73012_v);
return super.func_204210_a(p_204210_1_, p_204210_2_, p_204210_3_);
}
@@ -145,7 +154,7 @@
@@ -145,7 +153,7 @@
protected void func_190738_dp() {
EntityVillager entityvillager = new EntityVillager(this.field_70170_p);
entityvillager.func_82149_j(this);
@ -49,7 +50,7 @@
entityvillager.func_190672_a(this.field_70170_p.func_175649_E(new BlockPos(entityvillager)), (IEntityLivingData)null, (NBTTagCompound)null, false);
entityvillager.func_82187_q();
if (this.func_70631_g_()) {
@@ -224,4 +233,28 @@
@@ -224,4 +232,28 @@
protected ItemStack func_190732_dj() {
return ItemStack.field_190927_a;
}

2
patches/minecraft/net/minecraft/network/datasync/EntityDataManager.java.patch
View File

@ -12,7 +12,7 @@
- field_190303_a.debug("defineId called for: {} from {}", p_187226_0_, oclass, new RuntimeException());
+ // Forge: log at warn, mods should not add to classes that they don't own, and only add stacktrace when in debug is enabled as it is mostly not needed and consumes time
+ if (field_190303_a.isDebugEnabled()) field_190303_a.warn("defineId called for: {} from {}", p_187226_0_, oclass, new RuntimeException());
+ field_190303_a.debug("defineId called for: {} from {}", p_187226_0_, oclass);
+ else field_190303_a.debug("defineId called for: {} from {}", p_187226_0_, oclass);
}
} catch (ClassNotFoundException var5) {
;

2
patches/minecraft/net/minecraft/pathfinding/WalkNodeProcessor.java.patch
View File

@ -38,7 +38,7 @@
+ if (block == Blocks.field_150434_aF || type == PathNodeType.DAMAGE_CACTUS) {
p_193578_5_ = PathNodeType.DANGER_CACTUS;
- } else if (block == Blocks.field_150480_ab) {
+ } else if (block == Blocks.field_150480_ab || state.isBurning(p_193578_1_, blockpos$pooledmutableblockpos) || type == PathNodeType.DAMAGE_FIRE) {
+ } else if (block == Blocks.field_150480_ab || type == PathNodeType.DAMAGE_FIRE) {
p_193578_5_ = PathNodeType.DANGER_FIRE;
+ } else if (type == PathNodeType.DAMAGE_OTHER) {
+ p_193578_5_ = PathNodeType.DAMAGE_OTHER;