diff --git a/Patches/CraftBukkit-Patches/0175-Fix-schedulers.patch b/Patches/CraftBukkit-Patches/0175-Fix-schedulers.patch new file mode 100644 index 000000000..e6e990d00 --- /dev/null +++ b/Patches/CraftBukkit-Patches/0175-Fix-schedulers.patch @@ -0,0 +1,37 @@ +From 896df3218cf190a29901619e762b5399517dbfbd Mon Sep 17 00:00:00 2001 +From: libraryaddict +Date: Wed, 11 Nov 2015 11:43:17 +1300 +Subject: [PATCH] Fix schedulers + + +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 1d29ae7..55e2afd 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -705,6 +705,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs + } + + public void B() { ++ SpigotTimings.schedulerTimer.startTiming(); // Spigot ++ // CraftBukkit start ++ this.server.getScheduler().mainThreadHeartbeat(this.ticks); ++ SpigotTimings.schedulerTimer.stopTiming(); // Spigot ++ + this.methodProfiler.a("jobs"); + Queue queue = this.j; + +@@ -718,11 +723,6 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs + + this.methodProfiler.c("levels"); + +- SpigotTimings.schedulerTimer.startTiming(); // Spigot +- // CraftBukkit start +- this.server.getScheduler().mainThreadHeartbeat(this.ticks); +- SpigotTimings.schedulerTimer.stopTiming(); // Spigot +- + // Run tasks that are waiting on processing + SpigotTimings.processQueueTimer.startTiming(); // Spigot + while (!processQueue.isEmpty()) { +-- +1.9.5.msysgit.0 + diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar index 74bb320e1..5bbef8dd0 100644 Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java index e0f96dc9f..8587871ee 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java @@ -78,10 +78,13 @@ public class UtilEnt public static void Leash(LivingEntity leashed, Entity holder, boolean pull, boolean breakable) { - leashed.setPullWhileLeashed(pull); - leashed.setShouldBreakLeash(breakable); - leashed.setLeashHolder(holder); + + if (!(((CraftLivingEntity)leashed).getHandle() instanceof EntityInsentient)) + return; + + ((EntityInsentient)((CraftLivingEntity)leashed).getHandle()).setPullWhileLeashed(pull); + ((EntityInsentient)((CraftLivingEntity)leashed).getHandle()).setShouldBreakLeash(breakable); } public static void addLookAtPlayerAI(Entity entity, float dist) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/PacketsInteractionFix.java b/Plugins/Mineplex.Core/src/mineplex/core/PacketsInteractionFix.java index 23901a1b8..a5f302e97 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/PacketsInteractionFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/PacketsInteractionFix.java @@ -55,7 +55,7 @@ public class PacketsInteractionFix extends MiniPlugin implements IPacketHandler _leftClicked.clear(); } - @EventHandler + //@EventHandler public void onArmAnimation(PlayerAnimationEvent event) { if (event.getAnimationType() != PlayerAnimationType.ARM_SWING) @@ -110,7 +110,7 @@ public class PacketsInteractionFix extends MiniPlugin implements IPacketHandler } } - @EventHandler + //@EventHandler public void onPlayerInteract(PlayerInteractEvent event) { if (!event.getAction().name().contains("LEFT")) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java index 7847b0408..8954b07c0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java @@ -134,9 +134,10 @@ public class Chat extends MiniPlugin public void preventMe(PlayerCommandPreprocessEvent event) { if (event.getMessage().toLowerCase().startsWith("/me ") - || event.getMessage().toLowerCase().startsWith("/bukkit")) + || event.getMessage().toLowerCase().startsWith("/bukkit") + || event.getMessage().toLowerCase().startsWith("/minecraft")) { - event.getPlayer().sendMessage(F.main(getName(), "No, you!")); + event.getPlayer().sendMessage(F.main(getName(), "Nope, not allowed!")); event.setCancelled(true); } } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java index 2f8a774d4..2ac87ef75 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java @@ -226,7 +226,7 @@ public class StackerManager extends MiniPlugin implements IThrown UtilAction.velocity(throwee, thrower.getLocation().getDirection(), 1.8, false, 0, 0.3, 2, false); - _projectileManager.AddThrow(throwee, thrower, this, -1, true, false, true, false, 0.5f); + _projectileManager.AddThrow(throwee, thrower, this, 4000, true, false, true, false, 0.5f); //Portal Delay Manager.SetPortalDelay(thrower);