2018-08-05 23:46:43 +00:00
|
|
|
From 47b1de18f9769b9514bdfa76a274b617af51a8a8 Mon Sep 17 00:00:00 2001
|
2016-03-28 23:57:13 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 28 Mar 2016 19:55:45 -0400
|
|
|
|
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
|
|
|
|
|
|
|
|
Not sure of any reason a plugin would need to act on a Physics event
|
|
|
|
for redstone. There is a BlockRedstoneEvent that plugins can also use
|
|
|
|
for accessing redstone activity.
|
|
|
|
|
|
|
|
Defaulting this to false will provide substantial performance improvement
|
|
|
|
by saving millions of event calls on redstone heavy servers.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-08-05 23:46:43 +00:00
|
|
|
index c2c33d75bf..b3b3baddc0 100644
|
2016-03-28 23:57:13 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-07-24 00:24:44 +00:00
|
|
|
@@ -217,4 +217,9 @@ public class PaperWorldConfig {
|
2016-11-17 02:23:38 +00:00
|
|
|
private void skeleHorseSpawnChance() {
|
|
|
|
skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", 0.01D); // -1.0D represents a "vanilla" state
|
2016-03-28 23:57:13 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean firePhysicsEventForRedstone = false;
|
|
|
|
+ private void firePhysicsEventForRedstone() {
|
|
|
|
+ firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2018-08-05 23:46:43 +00:00
|
|
|
index 1df7528949..87fd23c7f8 100644
|
2016-03-28 23:57:13 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2018-07-29 16:42:07 +00:00
|
|
|
@@ -593,7 +593,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
2016-03-28 23:57:13 +00:00
|
|
|
try {
|
|
|
|
// CraftBukkit start
|
|
|
|
CraftWorld world = ((WorldServer) this).getWorld();
|
|
|
|
- if (world != null) {
|
|
|
|
+ if (world != null && !((WorldServer)this).stopPhysicsEvent) { // Paper
|
2018-07-15 01:53:17 +00:00
|
|
|
BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
|
2016-03-28 23:57:13 +00:00
|
|
|
this.getServer().getPluginManager().callEvent(event);
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
2018-08-05 23:46:43 +00:00
|
|
|
index ecee3b4064..96002184bb 100644
|
2016-03-28 23:57:13 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
2018-07-15 01:53:17 +00:00
|
|
|
@@ -36,6 +36,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
|
2016-03-28 23:57:13 +00:00
|
|
|
public class WorldServer extends World implements IAsyncTaskHandler {
|
|
|
|
|
|
|
|
private static final Logger a = LogManager.getLogger();
|
|
|
|
+ boolean stopPhysicsEvent = false; // Paper
|
|
|
|
private final MinecraftServer server;
|
|
|
|
public EntityTracker tracker;
|
|
|
|
private final PlayerChunkMap manager;
|
2018-07-15 01:53:17 +00:00
|
|
|
@@ -676,6 +677,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
|
|
IBlockData iblockdata = this.getType(nextticklistentry.a);
|
2016-03-28 23:57:13 +00:00
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
if (iblockdata.getBlock() == nextticklistentry.a()) {
|
|
|
|
+ stopPhysicsEvent = !paperConfig.firePhysicsEventForRedstone && (iblockdata.getBlock() instanceof BlockDiodeAbstract || iblockdata.getBlock() instanceof BlockRedstoneTorch); // Paper
|
|
|
|
iblockdata.a((World) this, nextticklistentry.a, this.random);
|
|
|
|
}
|
2016-03-28 23:57:13 +00:00
|
|
|
|
|
|
|
--
|
2018-07-04 07:55:24 +00:00
|
|
|
2.18.0
|
2016-03-28 23:57:13 +00:00
|
|
|
|