Fix CME in EventManager

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/EventManager.java

@@ -1,7 +1,6 @@
 package net.earthcomputer.clientcommands;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import net.earthcomputer.clientcommands.ToolDamageManager.ToolDamagedEvent;
@@ -461,30 +460,18 @@ default boolean isOneTime() {
 
 	private static class Listeners<E extends Event> {
 		private List<Listener<E>> listeners = new ArrayList<>();
-		private List<Listener<E>> toAdd = new ArrayList<>();
-		private boolean invoking = false;
 
 		public void invoke(E e) {
-			invoking = true;
-			Iterator<Listener<E>> itr = listeners.iterator();
-			while (itr.hasNext()) {
-				Listener<E> listener = itr.next();
+			for (Listener<E> listener : new ArrayList<>(listeners)) {
 				listener.accept(e);
 				if (listener.isOneTime()) {
-					itr.remove();
+					listeners.remove(listener);
 				}
 			}
-			invoking = false;
-			listeners.addAll(toAdd);
-			toAdd.clear();
 		}
 
 		public void add(Listener<E> listener) {
-			if (invoking) {
-				toAdd.add(listener);
-			} else {
-				listeners.add(listener);
-			}
+			listeners.add(listener);
 		}
 	}
 

src/main/java/net/earthcomputer/clientcommands/TempRulesImpl.java

@@ -48,6 +48,23 @@ private static void initToolBreakProtection() {
 				}
 			}
 		});
+		EventManager.addPostDamageItemListener(e -> {
+			if (TempRules.TOOL_BREAK_PROTECTION.getValue()) {
+				// fix client-server desync
+				e.getItemStack().setItemDamage(e.getItemStack().getItemDamage() + e.getDamageAmount());
+				if (EnchantmentHelper.getEnchantmentLevel(Enchantments.UNBREAKING, e.getItemStack()) > 0) {
+					if (e.getEntityPlayer().openContainer == e.getEntityPlayer().inventoryContainer) {
+						// Pickup the item and put it back again to refresh durability
+						for (int i = 0; i < 2; i++) {
+							Minecraft.getMinecraft().playerController.windowClick(
+									e.getEntityPlayer().openContainer.windowId,
+									e.getEntityPlayer().inventory.currentItem, 0, ClickType.PICKUP,
+									e.getEntityPlayer());
+						}
+					}
+				}
+			}
+		});
 	}
 
 }