From 75279a3486ad6f30c71be2f00e16da893a8c28cd Mon Sep 17 00:00:00 2001 From: Sotr Date: Sat, 23 Mar 2019 17:45:14 +0800 Subject: [PATCH] Hotfix - fixes incorrect comment --- src/main/java/net/minecraft/server/EntityFireball.java | 10 +++++----- src/main/java/net/minecraft/server/FluidTypeLava.java | 6 +++++- src/main/java/net/minecraft/server/ItemBucket.java | 10 +++++++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java index ce1824033..b6cdfef4a 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -91,21 +91,21 @@ public abstract class EntityFireball extends Entity { this.locY += this.motY; this.locZ += this.motZ; ProjectileHelper.a(this, 0.2F); - // Akarin start - this handle by client - /* float f = this.k(); if (this.isInWater()) { + // Akarin start - this handle by client + /* for (int i = 0; i < 4; ++i) { float f1 = 0.25F; this.world.addParticle(Particles.e, this.locX - this.motX * 0.25D, this.locY - this.motY * 0.25D, this.locZ - this.motZ * 0.25D, this.motX, this.motY, this.motZ); } + */ + // Akarin end f = 0.8F; } - */ - // Akarin end this.motX += this.dirX; this.motY += this.dirY; @@ -113,7 +113,7 @@ public abstract class EntityFireball extends Entity { this.motX *= (double) f; this.motY *= (double) f; this.motZ *= (double) f; - this.world.addParticle(this.i(), this.locX, this.locY + 0.5D, this.locZ, 0.0D, 0.0D, 0.0D); // Akarin - this handle by client + //this.world.addParticle(this.i(), this.locX, this.locY + 0.5D, this.locZ, 0.0D, 0.0D, 0.0D); // Akarin - this handle by client this.setPosition(this.locX, this.locY, this.locZ); } } diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java index 25a19736a..be77fd399 100644 --- a/src/main/java/net/minecraft/server/FluidTypeLava.java +++ b/src/main/java/net/minecraft/server/FluidTypeLava.java @@ -132,14 +132,18 @@ public abstract class FluidTypeLava extends FluidTypeFlowing { } protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition) { - // Akarin start - this handle by client + // Akarin start /* double d0 = (double) blockposition.getX(); double d1 = (double) blockposition.getY(); double d2 = (double) blockposition.getZ(); + */ + // Akarin end generatoraccess.a((EntityHuman) null, blockposition, SoundEffects.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (generatoraccess.m().nextFloat() - generatoraccess.m().nextFloat()) * 0.8F); + // Akarin start - this handle by client + /* for (int i = 0; i < 8; ++i) { generatoraccess.addParticle(Particles.F, d0 + Math.random(), d1 + 1.2D, d2 + Math.random(), 0.0D, 0.0D, 0.0D); } diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java index 934b4abcd..bb74d5ab4 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -146,16 +146,24 @@ public class ItemBucket extends Item { } } // CraftBukkit end - if (false && world.worldProvider.isNether() && this.fluidType.a(TagsFluid.WATER)) { // Akarin - this handle by client + if (world.worldProvider.isNether() && this.fluidType.a(TagsFluid.WATER)) { + // Akarin start - this handle by client + /* int i = blockposition.getX(); int j = blockposition.getY(); int k = blockposition.getZ(); + */ + // Akarin end world.a(entityhuman, blockposition, SoundEffects.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F); + // Akarin start - this handle by client + /* for (int l = 0; l < 8; ++l) { world.addParticle(Particles.F, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D); } + */ + // Akarin end } else if (iblockdata.getBlock() instanceof IFluidContainer) { if (((IFluidContainer) iblockdata.getBlock()).place(world, blockposition, iblockdata, ((FluidTypeFlowing) this.fluidType).a(false))) { this.a(entityhuman, (GeneratorAccess) world, blockposition);