mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 05:02:18 +00:00
Convert Forge to use Official mappings. Mojang released their obfuscation mappings but we have not used them up until now due to wanting to get their license to be more explicitly permissive. It is clear that their intent is to allow us to use their names for developing mods like this. See the full wording, and our interpretation here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
21 lines
1.2 KiB
Diff
21 lines
1.2 KiB
Diff
--- a/net/minecraft/block/RedstoneDiodeBlock.java
|
|
+++ b/net/minecraft/block/RedstoneDiodeBlock.java
|
|
@@ -65,7 +_,7 @@
|
|
if (p_220069_1_.func_196955_c(p_220069_2_, p_220069_3_)) {
|
|
this.func_176398_g(p_220069_2_, p_220069_3_, p_220069_1_);
|
|
} else {
|
|
- TileEntity tileentity = this.func_235695_q_() ? p_220069_2_.func_175625_s(p_220069_3_) : null;
|
|
+ TileEntity tileentity = p_220069_1_.hasTileEntity() ? p_220069_2_.func_175625_s(p_220069_3_) : null;
|
|
func_220059_a(p_220069_1_, p_220069_2_, p_220069_3_, tileentity);
|
|
p_220069_2_.func_217377_a(p_220069_3_, false);
|
|
|
|
@@ -163,6 +_,8 @@
|
|
protected void func_176400_h(World p_176400_1_, BlockPos p_176400_2_, BlockState p_176400_3_) {
|
|
Direction direction = p_176400_3_.func_177229_b(field_185512_D);
|
|
BlockPos blockpos = p_176400_2_.func_177972_a(direction.func_176734_d());
|
|
+ if (net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(p_176400_1_, p_176400_2_, p_176400_1_.func_180495_p(p_176400_2_), java.util.EnumSet.of(direction.func_176734_d()), false).isCanceled())
|
|
+ return;
|
|
p_176400_1_.func_190524_a(blockpos, this, p_176400_2_);
|
|
p_176400_1_.func_175695_a(blockpos, this, direction);
|
|
}
|