From ae13a7f6645cbcee6c60cf58d93585f13f4fcafe Mon Sep 17 00:00:00 2001
From: MaXFeeD <maksfeed.mf@gmail.com>
Date: Sat, 24 Feb 2024 18:56:33 +0300
Subject: [PATCH] =?UTF-8?q?feat:=20=D0=9E=D0=B2=D0=B2=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=B4=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=82=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=BF=D0=B0=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B6=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Используется новая реализация Nukkit-MOT вместо овверайдов, по умолчанию сервер не перезапускается при ошибках тика.
---
 README.md                                          |  2 +-
 .../java/com/reider745/event/EventListener.java    | 14 --------------
 src/main/resources/zotecore.yml                    |  2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 735a9c54..7d42745e 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ display-ticking-errors-to-players: true
 
 # Если серверный тик прерывается слишком часто, сервер будет остановлен;
 # в противном случае тик будет пытаться продолжать перезапуски.
-stop-on-critical-ticking-error: true
+stop-on-critical-ticking-error: false
 ```
 
 ## Консольные команды
diff --git a/src/main/java/com/reider745/event/EventListener.java b/src/main/java/com/reider745/event/EventListener.java
index b9dfd0e2..4e265946 100644
--- a/src/main/java/com/reider745/event/EventListener.java
+++ b/src/main/java/com/reider745/event/EventListener.java
@@ -66,7 +66,6 @@ import com.zhekasmirnov.innercore.api.dimensions.CustomDimension;
 public class EventListener implements Listener {
     public static final Object DEALING_LOCK = new Object();
     public static Object dealingEvent = null;
-    private static long projectileHitEntity = -1;
 
     public static final int FORM_REJOIN_EXCEPTION = 2560;
 
@@ -140,15 +139,6 @@ public class EventListener implements Listener {
                         mop != null && mop.entityHit != null ? mop.entityHit.getId() : 0, mop != null ? mop.blockX : 0,
                         mop != null ? mop.blockY : 0, mop != null ? mop.blockZ : 0, mop != null ? mop.sideHit : -1,
                         item.getId(), item.count, item.getDamage(), extra));
-
-        if (event.isCancelled()) {
-            // It actually cannot prevent projectile remove, but cancelling
-            // damage is most common requirement
-            if (mop != null && mop.entityHit != null) {
-                projectileHitEntity = mop.entityHit.getId();
-            }
-            entity.isCollided = entity.isCollidedHorizontally = entity.isCollidedVertically = entity.hadCollision = false;
-        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
@@ -259,10 +249,6 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onEntityDamage(EntityDamageEvent event) {
-        if (event.getEntity().getId() == projectileHitEntity && event.getCause() == DamageCause.PROJECTILE) {
-            projectileHitEntity = -1;
-            return;
-        }
         if (event.equals(dealingEvent) || Boolean.TRUE.equals(dealingEvent)) {
             return;
         }
diff --git a/src/main/resources/zotecore.yml b/src/main/resources/zotecore.yml
index 0a56ff28..2cf2ad90 100644
--- a/src/main/resources/zotecore.yml
+++ b/src/main/resources/zotecore.yml
@@ -51,4 +51,4 @@ pack-version-code: 152
 
 # If ticking callback interrupts too often, server will be stopped;
 # otherwise it will continue trying restart itself continiously.
-# stop-on-critical-ticking-error: false
+# stop-on-critical-ticking-error: true