63 lines
4.8 KiB
Diff
63 lines
4.8 KiB
Diff
--- a/net/minecraft/network/play/ServerPlayNetHandler.java
|
|
+++ b/net/minecraft/network/play/ServerPlayNetHandler.java
|
|
@@ -391,9 +391,11 @@
|
|
}
|
|
|
|
entity.func_70080_a(d3, d4, d5, f, f1);
|
|
+ this.field_147369_b.func_70080_a(d3, d4, d5, this.field_147369_b.field_70177_z, this.field_147369_b.field_70125_A); // Forge - Resync player position on vehicle moving
|
|
boolean flag2 = serverworld.func_226665_a__(entity, entity.func_174813_aQ().func_186664_h(0.0625D));
|
|
if (flag && (flag1 || !flag2)) {
|
|
entity.func_70080_a(d0, d1, d2, f, f1);
|
|
+ this.field_147369_b.func_70080_a(d3, d4, d5, this.field_147369_b.field_70177_z, this.field_147369_b.field_70125_A); // Forge - Resync player position on vehicle moving
|
|
this.field_147371_a.func_179290_a(new SMoveVehiclePacket(entity));
|
|
return;
|
|
}
|
|
@@ -410,7 +412,7 @@
|
|
}
|
|
|
|
private boolean func_241162_a_(Entity p_241162_1_) {
|
|
- return p_241162_1_.field_70170_p.func_234853_a_(p_241162_1_.func_174813_aQ().func_186662_g(0.0625D).func_72321_a(0.0D, -0.55D, 0.0D)).allMatch(AbstractBlock.AbstractBlockState::func_196958_f);
|
|
+ return BlockPos.func_239581_a_(p_241162_1_.func_174813_aQ().func_186662_g(0.0625D).func_72321_a(0.0D, -0.55D, 0.0D)).allMatch(b -> p_241162_1_.field_70170_p.func_180495_p(b).isAir(p_241162_1_.field_70170_p, b));
|
|
}
|
|
|
|
public void func_184339_a(CConfirmTeleportPacket p_184339_1_) {
|
|
@@ -950,7 +952,9 @@
|
|
Direction direction = blockraytraceresult.func_216354_b();
|
|
this.field_147369_b.func_143004_u();
|
|
if (blockpos.func_177956_o() < this.field_147367_d.func_71207_Z()) {
|
|
- if (this.field_184362_y == null && this.field_147369_b.func_70092_e((double)blockpos.func_177958_n() + 0.5D, (double)blockpos.func_177956_o() + 0.5D, (double)blockpos.func_177952_p() + 0.5D) < 64.0D && serverworld.func_175660_a(this.field_147369_b, blockpos)) {
|
|
+ double dist = field_147369_b.func_110148_a(net.minecraftforge.common.ForgeMod.REACH_DISTANCE.get()).func_111126_e() + 3;
|
|
+ dist *= dist;
|
|
+ if (this.field_184362_y == null && this.field_147369_b.func_70092_e((double)blockpos.func_177958_n() + 0.5D, (double)blockpos.func_177956_o() + 0.5D, (double)blockpos.func_177952_p() + 0.5D) < dist && serverworld.func_175660_a(this.field_147369_b, blockpos)) {
|
|
ActionResultType actionresulttype = this.field_147369_b.field_71134_c.func_219441_a(this.field_147369_b, serverworld, itemstack, hand, blockraytraceresult);
|
|
if (direction == Direction.UP && !actionresulttype.func_226246_a_() && blockpos.func_177956_o() >= this.field_147367_d.func_71207_Z() - 1 && func_241166_a_(this.field_147369_b, itemstack)) {
|
|
ITextComponent itextcomponent = (new TranslationTextComponent("build.tooHigh", this.field_147367_d.func_71207_Z())).func_240699_a_(TextFormatting.RED);
|
|
@@ -1097,7 +1101,9 @@
|
|
if (p_244548_1_.startsWith("/")) {
|
|
this.func_147361_d(p_244548_1_);
|
|
} else {
|
|
- ITextComponent itextcomponent = new TranslationTextComponent("chat.type.text", this.field_147369_b.func_145748_c_(), p_244548_1_);
|
|
+ ITextComponent itextcomponent = new TranslationTextComponent("chat.type.text", this.field_147369_b.func_145748_c_(), net.minecraftforge.common.ForgeHooks.newChatWithLinks(p_244548_1_));
|
|
+ itextcomponent = net.minecraftforge.common.ForgeHooks.onServerChatEvent(this, p_244548_1_, itextcomponent);
|
|
+ if (itextcomponent == null) return;
|
|
this.field_147367_d.func_184103_al().func_232641_a_(itextcomponent, ChatType.CHAT, this.field_147369_b.func_110124_au());
|
|
}
|
|
|
|
@@ -1187,6 +1193,7 @@
|
|
if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.INTERACT) {
|
|
optional = Optional.of(this.field_147369_b.func_190775_a(entity, hand));
|
|
} else if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.INTERACT_AT) {
|
|
+ if (net.minecraftforge.common.ForgeHooks.onInteractEntityAt(field_147369_b, entity, p_147340_1_.func_179712_b(), hand) != null) return;
|
|
optional = Optional.of(entity.func_184199_a(this.field_147369_b, p_147340_1_.func_179712_b(), hand));
|
|
} else if (p_147340_1_.func_149565_c() == CUseEntityPacket.Action.ATTACK) {
|
|
if (entity instanceof ItemEntity || entity instanceof ExperienceOrbEntity || entity instanceof AbstractArrowEntity || entity == this.field_147369_b) {
|
|
@@ -1402,6 +1409,8 @@
|
|
}
|
|
|
|
public void func_147349_a(CCustomPayloadPacket p_147349_1_) {
|
|
+ PacketThreadUtil.func_218796_a(p_147349_1_, this, this.field_147369_b.func_71121_q());
|
|
+ net.minecraftforge.fml.network.NetworkHooks.onCustomPayload(p_147349_1_, this.field_147371_a);
|
|
}
|
|
|
|
public void func_217263_a(CSetDifficultyPacket p_217263_1_) {
|