Merge remote-tracking branch 'origin/pr/3072' into 1.10.x
This commit is contained in:
commit
5a3047fbc2
2 changed files with 20 additions and 1 deletions
|
@ -0,0 +1,11 @@
|
|||
--- ../src-base/minecraft/net/minecraft/block/BlockRailDetector.java
|
||||
+++ ../src-work/minecraft/net/minecraft/block/BlockRailDetector.java
|
||||
@@ -156,6 +156,8 @@
|
||||
{
|
||||
if (((Boolean)p_180641_1_.func_177229_b(field_176574_M)).booleanValue())
|
||||
{
|
||||
+ List<EntityMinecart> carts = this.func_176571_a(p_180641_2_, p_180641_3_, EntityMinecart.class);
|
||||
+ if (!carts.isEmpty() && carts.get(0).getComparatorLevel() > -1) return carts.get(0).getComparatorLevel();
|
||||
List<EntityMinecartCommandBlock> list = this.<EntityMinecartCommandBlock>func_176571_a(p_180641_2_, p_180641_3_, EntityMinecartCommandBlock.class, new Predicate[0]);
|
||||
|
||||
if (!list.isEmpty())
|
|
@ -236,7 +236,7 @@
|
|||
{
|
||||
p_70108_1_.field_70159_w *= 0.20000000298023224D;
|
||||
p_70108_1_.field_70179_y *= 0.20000000298023224D;
|
||||
@@ -1017,6 +1049,221 @@
|
||||
@@ -1017,6 +1049,229 @@
|
||||
this.func_184212_Q().func_187227_b(field_184270_f, Boolean.valueOf(p_94096_1_));
|
||||
}
|
||||
|
||||
|
@ -453,6 +453,14 @@
|
|||
+ return 0.0078125D;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Called from Detector Rails to retrieve a redstone power level for comparators.
|
||||
+ */
|
||||
+ public int getComparatorLevel()
|
||||
+ {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ /* =================================== FORGE END ===========================================*/
|
||||
+
|
||||
public static enum Type
|
||||
|
|
Loading…
Reference in a new issue