Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-16 13:00:06 +01:00
485 Zeilen
24 KiB
Diff
485 Zeilen
24 KiB
Diff
--- a/net/minecraft/server/WorldServer.java
|
|
+++ b/net/minecraft/server/WorldServer.java
|
|
@@ -31,6 +31,21 @@
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
+// CraftBukkit start
|
|
+import java.util.logging.Level;
|
|
+import org.bukkit.Bukkit;
|
|
+
|
|
+import org.bukkit.WeatherType;
|
|
+import org.bukkit.block.BlockState;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.craftbukkit.util.HashTreeSet;
|
|
+
|
|
+import org.bukkit.event.block.BlockFormEvent;
|
|
+import org.bukkit.event.entity.CreatureSpawnEvent;
|
|
+import org.bukkit.event.server.MapInitializeEvent;
|
|
+import org.bukkit.event.weather.LightningStrikeEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class WorldServer extends World {
|
|
|
|
private static final Logger v = LogManager.getLogger();
|
|
@@ -56,12 +71,31 @@
|
|
@Nullable
|
|
private final MobSpawnerTrader mobSpawnerTrader;
|
|
|
|
- public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener) {
|
|
+ // CraftBukkit start
|
|
+ public final DimensionManager dimension;
|
|
+ private int tickPosition;
|
|
+
|
|
+ // Add env and gen to constructor
|
|
+ public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
|
|
super(worlddata, dimensionmanager, (world, worldprovider) -> {
|
|
- return new ChunkProviderServer((WorldServer) world, worldnbtstorage.getDirectory(), worldnbtstorage.getDataFixer(), worldnbtstorage.f(), executor, worldprovider.getChunkGenerator(), minecraftserver.getPlayerList().getViewDistance(), minecraftserver.getPlayerList().getViewDistance() - 2, worldloadlistener, () -> {
|
|
+ // CraftBukkit start
|
|
+ ChunkGenerator<?> chunkGenerator;
|
|
+
|
|
+ if (gen != null) {
|
|
+ chunkGenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(world, world.getSeed(), gen);
|
|
+ } else {
|
|
+ chunkGenerator = worldprovider.getChunkGenerator();
|
|
+ }
|
|
+
|
|
+ return new ChunkProviderServer((WorldServer) world, worldnbtstorage.getDirectory(), worldnbtstorage.getDataFixer(), worldnbtstorage.f(), executor, chunkGenerator, minecraftserver.getPlayerList().getViewDistance(), minecraftserver.getPlayerList().getViewDistance() - 2, worldloadlistener, () -> {
|
|
return minecraftserver.getWorldServer(DimensionManager.OVERWORLD).getWorldPersistentData();
|
|
});
|
|
- }, gameprofilerfiller, false);
|
|
+ // CraftBukkit end
|
|
+ }, gameprofilerfiller, false, gen, env);
|
|
+ this.dimension = dimensionmanager;
|
|
+ this.pvpMode = minecraftserver.getPVP();
|
|
+ worlddata.world = this;
|
|
+ // CraftBukkit end
|
|
this.nextTickListBlock = new TickListServer<>(this, (block) -> {
|
|
return block == null || block.getBlockData().isAir();
|
|
}, IRegistry.BLOCK::getKey, IRegistry.BLOCK::get, this::b);
|
|
@@ -85,6 +119,7 @@
|
|
}
|
|
|
|
this.mobSpawnerTrader = this.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD ? new MobSpawnerTrader(this) : null;
|
|
+ this.getServer().addWorld(this.getWorld()); // CraftBukkit
|
|
}
|
|
|
|
public void doTick(BooleanSupplier booleansupplier) {
|
|
@@ -161,6 +196,7 @@
|
|
this.m = MathHelper.a(this.m, 0.0F, 1.0F);
|
|
}
|
|
|
|
+ /* CraftBukkit start
|
|
if (this.l != this.m) {
|
|
this.server.getPlayerList().a((Packet) (new PacketPlayOutGameStateChange(7, this.m)), this.worldProvider.getDimensionManager());
|
|
}
|
|
@@ -179,13 +215,34 @@
|
|
this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(7, this.m));
|
|
this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(8, this.o));
|
|
}
|
|
+ // */
|
|
+ for (int idx = 0; idx < this.players.size(); ++idx) {
|
|
+ if (((EntityPlayer) this.players.get(idx)).world == this) {
|
|
+ ((EntityPlayer) this.players.get(idx)).tickWeather();
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (flag != this.isRaining()) {
|
|
+ // Only send weather packets to those affected
|
|
+ for (int idx = 0; idx < this.players.size(); ++idx) {
|
|
+ if (((EntityPlayer) this.players.get(idx)).world == this) {
|
|
+ ((EntityPlayer) this.players.get(idx)).setPlayerWeather((!flag ? WeatherType.DOWNFALL : WeatherType.CLEAR), false);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ for (int idx = 0; idx < this.players.size(); ++idx) {
|
|
+ if (((EntityPlayer) this.players.get(idx)).world == this) {
|
|
+ ((EntityPlayer) this.players.get(idx)).updateWeather(this.l, this.m, this.n, this.o);
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
if (this.getWorldData().isHardcore() && this.getDifficulty() != EnumDifficulty.HARD) {
|
|
this.getWorldData().setDifficulty(EnumDifficulty.HARD);
|
|
}
|
|
|
|
if (this.D && this.players.stream().noneMatch((entityplayer) -> {
|
|
- return !entityplayer.isSpectator() && !entityplayer.isDeeplySleeping();
|
|
+ return !entityplayer.isSpectator() && !entityplayer.isDeeplySleeping() && !entityplayer.fauxSleeping; // CraftBukkit
|
|
})) {
|
|
this.D = false;
|
|
if (this.getGameRules().getBoolean("doDaylightCycle")) {
|
|
@@ -226,7 +283,7 @@
|
|
this.ae();
|
|
this.ticking = false;
|
|
gameprofilerfiller.exitEnter("entities");
|
|
- boolean flag3 = !this.players.isEmpty() || !this.getForceLoadedChunks().isEmpty();
|
|
+ boolean flag3 = true || !this.players.isEmpty() || !this.getForceLoadedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
|
|
|
|
if (flag3) {
|
|
this.resetEmptyTime();
|
|
@@ -240,6 +297,11 @@
|
|
|
|
for (i = 0; i < this.globalEntityList.size(); ++i) {
|
|
entity = (Entity) this.globalEntityList.get(i);
|
|
+ // CraftBukkit start - Fixed an NPE
|
|
+ if (entity == null) {
|
|
+ continue;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.a((entity1) -> {
|
|
++entity1.ticksLived;
|
|
entity1.tick();
|
|
@@ -258,6 +320,7 @@
|
|
Entity entity1 = (Entity) entry.getValue();
|
|
Entity entity2 = entity1.getVehicle();
|
|
|
|
+ /* CraftBukkit start - We prevent spawning in general, so this butchering is not needed
|
|
if (!this.server.getSpawnAnimals() && (entity1 instanceof EntityAnimal || entity1 instanceof EntityWaterAnimal)) {
|
|
entity1.die();
|
|
}
|
|
@@ -265,6 +328,7 @@
|
|
if (!this.server.getSpawnNPCs() && entity1 instanceof NPC) {
|
|
entity1.die();
|
|
}
|
|
+ // CraftBukkit end */
|
|
|
|
if (entity2 != null) {
|
|
if (!entity2.dead && entity2.w(entity1)) {
|
|
@@ -325,10 +389,10 @@
|
|
entityhorseskeleton.r(true);
|
|
entityhorseskeleton.setAgeRaw(0);
|
|
entityhorseskeleton.setPosition((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
|
|
- this.addEntity(entityhorseskeleton);
|
|
+ this.addEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
|
|
}
|
|
|
|
- this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1));
|
|
+ this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
|
|
}
|
|
}
|
|
|
|
@@ -339,11 +403,11 @@
|
|
BiomeBase biomebase = this.getBiome(blockposition);
|
|
|
|
if (biomebase.a((IWorldReader) this, blockposition1)) {
|
|
- this.setTypeUpdate(blockposition1, Blocks.ICE.getBlockData());
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, Blocks.ICE.getBlockData(), null); // CraftBukkit
|
|
}
|
|
|
|
if (flag && biomebase.b(this, blockposition)) {
|
|
- this.setTypeUpdate(blockposition, Blocks.SNOW.getBlockData());
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition, Blocks.SNOW.getBlockData(), null); // CraftBukkit
|
|
}
|
|
|
|
if (flag && this.getBiome(blockposition1).b() == BiomeBase.Precipitation.RAIN) {
|
|
@@ -390,7 +454,7 @@
|
|
protected BlockPosition a(BlockPosition blockposition) {
|
|
BlockPosition blockposition1 = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, blockposition);
|
|
AxisAlignedBB axisalignedbb = (new AxisAlignedBB(blockposition1, new BlockPosition(blockposition1.getX(), this.getHeight(), blockposition1.getZ()))).g(3.0D);
|
|
- List<EntityLiving> list = this.a(EntityLiving.class, axisalignedbb, (entityliving) -> {
|
|
+ List<EntityLiving> list = this.a(EntityLiving.class, axisalignedbb, (java.util.function.Predicate<EntityLiving>) (entityliving) -> { // CraftBukkit - decompile error
|
|
return entityliving != null && entityliving.isAlive() && this.f(entityliving.getChunkCoordinates());
|
|
});
|
|
|
|
@@ -421,7 +485,7 @@
|
|
|
|
if (entityplayer.isSpectator()) {
|
|
++i;
|
|
- } else if (entityplayer.isSleeping()) {
|
|
+ } else if (entityplayer.isSleeping() || entityplayer.fauxSleeping) { // CraftBukkit
|
|
++j;
|
|
}
|
|
}
|
|
@@ -437,10 +501,22 @@
|
|
}
|
|
|
|
private void clearWeather() {
|
|
- this.worldData.setWeatherDuration(0);
|
|
+ // CraftBukkit start
|
|
this.worldData.setStorm(false);
|
|
- this.worldData.setThunderDuration(0);
|
|
+ // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
|
|
+ // Not that everyone ever manages to get the whole server to sleep at the same time....
|
|
+ if (!this.worldData.hasStorm()) {
|
|
+ this.worldData.setWeatherDuration(0);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.worldData.setThundering(false);
|
|
+ // CraftBukkit start
|
|
+ // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
|
|
+ // Not that everyone ever manages to get the whole server to sleep at the same time....
|
|
+ if (!this.worldData.isThundering()) {
|
|
+ this.worldData.setThunderDuration(0);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public void resetEmptyTime() {
|
|
@@ -478,6 +554,7 @@
|
|
return IRegistry.ENTITY_TYPE.getKey(entity.getEntityType()).toString();
|
|
});
|
|
entity.tick();
|
|
+ entity.postTick(); // CraftBukkit
|
|
this.getMethodProfiler().exit();
|
|
}
|
|
|
|
@@ -563,6 +640,22 @@
|
|
BlockPosition blockposition = worldchunkmanager.a(0, 0, 256, list, random);
|
|
ChunkCoordIntPair chunkcoordintpair = blockposition == null ? new ChunkCoordIntPair(0, 0) : new ChunkCoordIntPair(blockposition);
|
|
|
|
+ // CraftBukkit start
|
|
+ if (this.generator != null) {
|
|
+ Random rand = new Random(this.getSeed());
|
|
+ org.bukkit.Location spawn = this.generator.getFixedSpawnLocation(((WorldServer) this).getWorld(), rand);
|
|
+
|
|
+ if (spawn != null) {
|
|
+ if (spawn.getWorld() != ((WorldServer) this).getWorld()) {
|
|
+ throw new IllegalStateException("Cannot set spawn point for " + this.worldData.getName() + " to be in another world (" + spawn.getWorld().getName() + ")");
|
|
+ } else {
|
|
+ this.worldData.setSpawn(new BlockPosition(spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ()));
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
if (blockposition == null) {
|
|
WorldServer.v.warn("Unable to find spawn biome");
|
|
}
|
|
@@ -638,6 +731,7 @@
|
|
ChunkProviderServer chunkproviderserver = this.getChunkProvider();
|
|
|
|
if (!flag1) {
|
|
+ org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
|
|
if (iprogressupdate != null) {
|
|
iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0]));
|
|
}
|
|
@@ -716,8 +810,16 @@
|
|
|
|
while (objectiterator.hasNext()) {
|
|
Entity entity = (Entity) objectiterator.next();
|
|
+ // CraftBukkit start - Split out persistent check, don't apply it to special persistent mobs
|
|
+ if (entity instanceof EntityInsentient) {
|
|
+ EntityInsentient entityinsentient = (EntityInsentient) entity;
|
|
+ if (entityinsentient.isTypeNotPersistent(0) && entityinsentient.isPersistent()) {
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
|
|
- if (!(entity instanceof EntityInsentient) || !((EntityInsentient) entity).isPersistent()) {
|
|
+ if (true || !(entity instanceof EntityInsentient) || !((EntityInsentient) entity).isPersistent()) {
|
|
+ // CraftBukkit end
|
|
EnumCreatureType enumcreaturetype = entity.getEntityType().d();
|
|
|
|
if (enumcreaturetype != EnumCreatureType.MISC) {
|
|
@@ -733,11 +835,24 @@
|
|
|
|
@Override
|
|
public boolean addEntity(Entity entity) {
|
|
- return this.addEntity0(entity);
|
|
+ // CraftBukkit start
|
|
+ return this.addEntity0(entity, CreatureSpawnEvent.SpawnReason.DEFAULT);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
|
|
+ return this.addEntity0(entity, reason);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public boolean addEntitySerialized(Entity entity) {
|
|
- return this.addEntity0(entity);
|
|
+ // CraftBukkit start
|
|
+ return this.addEntitySerialized(entity, CreatureSpawnEvent.SpawnReason.DEFAULT);
|
|
+ }
|
|
+
|
|
+ public boolean addEntitySerialized(Entity entity, CreatureSpawnEvent.SpawnReason reason) {
|
|
+ return this.addEntity0(entity, reason);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public void addEntityTeleport(Entity entity) {
|
|
@@ -787,13 +902,18 @@
|
|
this.registerEntity(entityplayer);
|
|
}
|
|
|
|
- private boolean addEntity0(Entity entity) {
|
|
+ // CraftBukkit start
|
|
+ private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
|
|
if (entity.dead) {
|
|
- WorldServer.v.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType()));
|
|
+ // WorldServer.v.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
|
|
return false;
|
|
} else if (this.isUUIDTaken(entity)) {
|
|
return false;
|
|
} else {
|
|
+ if (!CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
IChunkAccess ichunkaccess = this.getChunkAt(MathHelper.floor(entity.locX / 16.0D), MathHelper.floor(entity.locZ / 16.0D), ChunkStatus.FULL, entity.attachedToPlayer);
|
|
|
|
if (!(ichunkaccess instanceof Chunk)) {
|
|
@@ -821,7 +941,7 @@
|
|
if (entity1 == null) {
|
|
return false;
|
|
} else {
|
|
- WorldServer.v.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString());
|
|
+ // WorldServer.v.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit
|
|
return true;
|
|
}
|
|
}
|
|
@@ -899,6 +1019,7 @@
|
|
if (entity instanceof EntityInsentient) {
|
|
this.I.add(((EntityInsentient) entity).getNavigation());
|
|
}
|
|
+ entity.valid = true; // CraftBukkit
|
|
}
|
|
|
|
}
|
|
@@ -929,6 +1050,18 @@
|
|
}
|
|
|
|
public void strikeLightning(EntityLightning entitylightning) {
|
|
+ // CraftBukkit start
|
|
+ this.strikeLightning(entitylightning, LightningStrikeEvent.Cause.UNKNOWN);
|
|
+ }
|
|
+
|
|
+ public void strikeLightning(EntityLightning entitylightning, LightningStrikeEvent.Cause cause) {
|
|
+ LightningStrikeEvent lightning = new LightningStrikeEvent(this.getWorld(), (org.bukkit.entity.LightningStrike) entitylightning.getBukkitEntity(), cause);
|
|
+ this.getServer().getPluginManager().callEvent(lightning);
|
|
+
|
|
+ if (lightning.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.globalEntityList.add(entitylightning);
|
|
this.server.getPlayerList().sendPacketNearby((EntityHuman) null, entitylightning.locX, entitylightning.locY, entitylightning.locZ, 512.0D, this.worldProvider.getDimensionManager(), new PacketPlayOutSpawnEntityWeather(entitylightning));
|
|
}
|
|
@@ -937,6 +1070,12 @@
|
|
public void a(int i, BlockPosition blockposition, int j) {
|
|
Iterator iterator = this.server.getPlayerList().getPlayers().iterator();
|
|
|
|
+ // CraftBukkit start
|
|
+ EntityHuman entityhuman = null;
|
|
+ Entity entity = this.getEntity(i);
|
|
+ if (entity instanceof EntityHuman) entityhuman = (EntityHuman) entity;
|
|
+ // CraftBukkit end
|
|
+
|
|
while (iterator.hasNext()) {
|
|
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
|
|
|
|
@@ -945,6 +1084,12 @@
|
|
double d1 = (double) blockposition.getY() - entityplayer.locY;
|
|
double d2 = (double) blockposition.getZ() - entityplayer.locZ;
|
|
|
|
+ // CraftBukkit start
|
|
+ if (entityhuman != null && entityhuman instanceof EntityPlayer && !entityplayer.getBukkitEntity().canSee(((EntityPlayer) entityhuman).getBukkitEntity())) {
|
|
+ continue;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
|
|
entityplayer.playerConnection.sendPacket(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
|
|
}
|
|
@@ -955,12 +1100,14 @@
|
|
|
|
@Override
|
|
public void a(@Nullable EntityHuman entityhuman, double d0, double d1, double d2, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1) {
|
|
- this.server.getPlayerList().sendPacketNearby(entityhuman, d0, d1, d2, f > 1.0F ? (double) (16.0F * f) : 16.0D, this.worldProvider.getDimensionManager(), new PacketPlayOutNamedSoundEffect(soundeffect, soundcategory, d0, d1, d2, f, f1));
|
|
+ // CraftBukkit - this.dimension
|
|
+ this.server.getPlayerList().sendPacketNearby(entityhuman, d0, d1, d2, f > 1.0F ? (double) (16.0F * f) : 16.0D, this.dimension, new PacketPlayOutNamedSoundEffect(soundeffect, soundcategory, d0, d1, d2, f, f1));
|
|
}
|
|
|
|
@Override
|
|
public void a(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1) {
|
|
- this.server.getPlayerList().sendPacketNearby(entityhuman, entity.locX, entity.locY, entity.locZ, f > 1.0F ? (double) (16.0F * f) : 16.0D, this.worldProvider.getDimensionManager(), new PacketPlayOutEntitySound(soundeffect, soundcategory, entity, f, f1));
|
|
+ // CraftBukkit - this.dimension
|
|
+ this.server.getPlayerList().sendPacketNearby(entityhuman, entity.locX, entity.locY, entity.locZ, f > 1.0F ? (double) (16.0F * f) : 16.0D, this.dimension, new PacketPlayOutEntitySound(soundeffect, soundcategory, entity, f, f1));
|
|
}
|
|
|
|
@Override
|
|
@@ -970,7 +1117,8 @@
|
|
|
|
@Override
|
|
public void a(@Nullable EntityHuman entityhuman, int i, BlockPosition blockposition, int j) {
|
|
- this.server.getPlayerList().sendPacketNearby(entityhuman, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 64.0D, this.worldProvider.getDimensionManager(), new PacketPlayOutWorldEvent(i, blockposition, j, false));
|
|
+ // CraftBukkit - this.dimension
|
|
+ this.server.getPlayerList().sendPacketNearby(entityhuman, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 64.0D, this.dimension, new PacketPlayOutWorldEvent(i, blockposition, j, false));
|
|
}
|
|
|
|
@Override
|
|
@@ -1005,6 +1153,14 @@
|
|
|
|
@Override
|
|
public Explosion createExplosion(@Nullable Entity entity, DamageSource damagesource, double d0, double d1, double d2, float f, boolean flag, Explosion.Effect explosion_effect) {
|
|
+ // CraftBukkit start
|
|
+ Explosion explosion = super.createExplosion(entity, damagesource, d0, d1, d2, f, flag, explosion_effect);
|
|
+
|
|
+ if (explosion.wasCanceled) {
|
|
+ return explosion;
|
|
+ }
|
|
+
|
|
+ /* Remove
|
|
Explosion explosion = new Explosion(this, entity, d0, d1, d2, f, flag, explosion_effect);
|
|
|
|
if (damagesource != null) {
|
|
@@ -1013,6 +1169,8 @@
|
|
|
|
explosion.a();
|
|
explosion.a(false);
|
|
+ */
|
|
+ // CraftBukkit end - TODO: Check if explosions are still properly implemented
|
|
if (explosion_effect == Explosion.Effect.NONE) {
|
|
explosion.clearBlocks();
|
|
}
|
|
@@ -1040,7 +1198,8 @@
|
|
BlockActionData blockactiondata = (BlockActionData) this.J.removeFirst();
|
|
|
|
if (this.a(blockactiondata)) {
|
|
- this.server.getPlayerList().sendPacketNearby((EntityHuman) null, (double) blockactiondata.a().getX(), (double) blockactiondata.a().getY(), (double) blockactiondata.a().getZ(), 64.0D, this.worldProvider.getDimensionManager(), new PacketPlayOutBlockAction(blockactiondata.a(), blockactiondata.b(), blockactiondata.c(), blockactiondata.d()));
|
|
+ // CraftBukkit - this.worldProvider.dimension -> this.dimension
|
|
+ this.server.getPlayerList().sendPacketNearby((EntityHuman) null, (double) blockactiondata.a().getX(), (double) blockactiondata.a().getY(), (double) blockactiondata.a().getZ(), 64.0D, dimension, new PacketPlayOutBlockAction(blockactiondata.a(), blockactiondata.b(), blockactiondata.c(), blockactiondata.d()));
|
|
}
|
|
}
|
|
|
|
@@ -1083,13 +1242,20 @@
|
|
}
|
|
|
|
public <T extends ParticleParam> int a(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
|
|
- PacketPlayOutWorldParticles packetplayoutworldparticles = new PacketPlayOutWorldParticles(t0, false, (float) d0, (float) d1, (float) d2, (float) d3, (float) d4, (float) d5, (float) d6, i);
|
|
+ // CraftBukkit - visibility api support
|
|
+ return sendParticles(null, t0, d0, d1, d2, i, d3, d4, d5, d6, false);
|
|
+ }
|
|
+
|
|
+ public <T extends ParticleParam> int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
|
|
+ PacketPlayOutWorldParticles packetplayoutworldparticles = new PacketPlayOutWorldParticles(t0, force, (float) d0, (float) d1, (float) d2, (float) d3, (float) d4, (float) d5, (float) d6, i);
|
|
+ // CraftBukkit end
|
|
int j = 0;
|
|
|
|
for (int k = 0; k < this.players.size(); ++k) {
|
|
EntityPlayer entityplayer = (EntityPlayer) this.players.get(k);
|
|
+ if (sender != null && !entityplayer.getBukkitEntity().canSee(sender.getBukkitEntity())) continue; // CraftBukkit
|
|
|
|
- if (this.a(entityplayer, false, d0, d1, d2, packetplayoutworldparticles)) {
|
|
+ if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
|
|
++j;
|
|
}
|
|
}
|
|
@@ -1172,7 +1338,13 @@
|
|
@Override
|
|
public WorldMap a(String s) {
|
|
return (WorldMap) this.getMinecraftServer().getWorldServer(DimensionManager.OVERWORLD).getWorldPersistentData().b(() -> {
|
|
- return new WorldMap(s);
|
|
+ // CraftBukkit start
|
|
+ // We only get here when the data file exists, but is not a valid map
|
|
+ WorldMap newMap = new WorldMap(s);
|
|
+ MapInitializeEvent event = new MapInitializeEvent(newMap.mapView);
|
|
+ Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+ return newMap;
|
|
+ // CraftBukkit end
|
|
}, s);
|
|
}
|
|
|