mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 08:38:45 +01:00
Include Redstone Torches in the redstone physics event optimization
This commit is contained in:
parent
539e1e024c
commit
11d1937145
1 changed files with 3 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
|||
From 2c031d019c95d2361b3a1cff4e12ace56697ff9a Mon Sep 17 00:00:00 2001
|
||||
From b228a1640f4cbe86afc1e4d3800ad03f3937d4d2 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 28 Mar 2016 19:55:45 -0400
|
||||
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
|
||||
|
@ -38,7 +38,7 @@ index 1a9a847..c6463b2 100644
|
|||
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
|
||||
index 0acce3e..c8e536c 100644
|
||||
index 0acce3e..1f0db4c 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -32,6 +32,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
|
||||
|
@ -53,7 +53,7 @@ index 0acce3e..c8e536c 100644
|
|||
|
||||
if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) {
|
||||
try {
|
||||
+ stopPhysicsEvent = !paperConfig.firePhysicsEventForRedstone && iblockdata.getBlock() instanceof BlockDiodeAbstract; // Paper
|
||||
+ stopPhysicsEvent = !paperConfig.firePhysicsEventForRedstone && (iblockdata.getBlock() instanceof BlockDiodeAbstract || iblockdata.getBlock() instanceof BlockRedstoneTorch); // Paper
|
||||
iblockdata.getBlock().b((World) this, nextticklistentry.a, iblockdata, this.random);
|
||||
} catch (Throwable throwable) {
|
||||
CrashReport crashreport = CrashReport.a(throwable, "Exception while ticking a block");
|
||||
|
|
Loading…
Reference in a new issue