This commit is contained in:
gnembon committed 2020-07-20 21:06:03 -03:00
1 parent 0e8cf69539
commit e67ec14285
25 files changed
+49 -50

No files matched your search

@@ -30,7 +30,7 @@ public abstract class LivingEntity_maxCollisionsMixin extends Entity
@Inject(method = "tickCramming", cancellable = true, at = @At("HEAD"))
private void tickPushingReplacement(CallbackInfo ci)
{
List<Entity> list_1 = this.world.getEntities((Entity)this, this.getBoundingBox(), EntityPredicates.canBePushedBy(this));
List<Entity> list_1 = this.world.getOtherEntities(this, this.getBoundingBox(), EntityPredicates.canBePushedBy(this));
if (!list_1.isEmpty()) {
int int_1 = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING);
int int_2;
@@ -92,7 +92,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac
Vec3d velocity = getVelocity();
if(!world.isClient && mergeBool && velocity.x == 0 && velocity.y == 0 && velocity.z == 0){
mergeBool = false;
for(Entity entity : world.getEntities(this, this.getBoundingBox())){
for(Entity entity : world.getOtherEntities(this, this.getBoundingBox())){
if(entity instanceof TntEntity && !entity.removed){
TntEntity entityTNTPrimed = (TntEntity)entity;
Vec3d tntVelocity = entityTNTPrimed.getVelocity();