Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
This commit is contained in:
commit
2722aeaaec
|
@ -0,0 +1,37 @@
|
|||
From 896df3218cf190a29901619e762b5399517dbfbd Mon Sep 17 00:00:00 2001
|
||||
From: libraryaddict <libraryaddict115@yahoo.co.nz>
|
||||
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
|
||||
|
Binary file not shown.
|
@ -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)
|
||||
|
|
|
@ -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"))
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue