Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Add option to fix physics event - PaperMC/Paper#1867

Browse Source
This commit is contained in:
Sotr
2019-03-07 13:06:55 +08:00
parent 6f25bb7ea4
commit e8a47919ce
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
View File

@@ -160,4 +160,9 @@ public class AkarinGlobalConfig {
fileIOThreads = fileIOThreads < 1 ? 1 : fileIOThreads;
fileIOThreads = fileIOThreads > 8 ? 8 : fileIOThreads;
}
public static boolean fixPhysicsEventBehaviour = false;
private static void fixPhysicsEventBehavior() {
fixPhysicsEventBehaviour = getBoolean("alternative.fix-physics-event-behaviour", fixPhysicsEventBehaviour);
}
}

22
src/main/java/net/minecraft/server/Block.java
View File

@@ -10,6 +10,9 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.event.block.BlockPhysicsEvent;
public class Block implements IMaterial {
@@ -172,7 +175,26 @@ public class Block implements IMaterial {
}
public static void a(IBlockData iblockdata, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, int i) {
// Akarin start
ensuresTypeAndData(iblockdata, iblockdata1, generatoraccess, blockposition, i, blockposition);
}
public static void ensuresTypeAndData(IBlockData iblockdata, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, int i, BlockPosition sourceBlockPosition) {
// Akarin end
if (iblockdata1 != iblockdata) {
// Akarin start - fixes physics event
if (io.akarin.server.core.AkarinGlobalConfig.fixPhysicsEventBehaviour && ((WorldServer) generatoraccess).hasPhysicsEvent) {
CraftWorld world = ((WorldServer) generatoraccess).getWorld();
if (world != null) {
BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata), world.getBlockAt(sourceBlockPosition.getX(), sourceBlockPosition.getY(), sourceBlockPosition.getZ()));
((WorldServer) generatoraccess).getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
}
}
// Akarin end
if (iblockdata1.isAir()) {
if (!generatoraccess.e()) {
generatoraccess.setAir(blockposition, (i & 32) == 0);

2
src/main/java/net/minecraft/server/World.java
View File

@@ -519,7 +519,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
// CraftBukkit start
iblockdata1.b(this, blockposition, j); // Don't call an event for the old block to limit event spam
CraftWorld world = ((WorldServer) this).getWorld();
if (world != null && ((WorldServer)this).hasPhysicsEvent) { // Paper
if (world != null && ((WorldServer)this).hasPhysicsEvent && !io.akarin.server.core.AkarinGlobalConfig.fixPhysicsEventBehaviour) { // Paper // Akarin - fixes physics event
BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
this.getServer().getPluginManager().callEvent(event);