SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from upstream SpigotMC

Browse Source 
3beb7729816
a77ed5758a7
52c130fc6d9
This commit is contained in:
Zach Brown
2014-12-20 19:09:49 -06:00
parent 73bc2489c0
commit a9b3e95f53
7 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Bukkit-Patches/0029-BungeeCord-Chat-API.patch
View File

@@ -80,6 +80,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
Spigot spigot(); Spigot spigot();
-- --
1.9.4.msysgit.2

4
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@@ -120,6 +120,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
Properties properties = new Properties(); Properties properties = new Properties();
if (stream != null) { if (stream != null) {
-- --
1.9.4.msysgit.2

5
CraftBukkit-Patches/0015-Entity-Activation-Range.patch
View File

@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
+ public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); + public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
+ public final boolean defaultActivationState; + public final boolean defaultActivationState;
+ public long activatedTick = 0; + public long activatedTick = Integer.MIN_VALUE;
+ public void inactiveTick() { } + public void inactiveTick() { }
+ // Spigot end + // Spigot end
@@ -455,7 +455,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public static boolean checkIfActive(Entity entity) + public static boolean checkIfActive(Entity entity)
+ { + {
+ SpigotTimings.checkIfActiveTimer.startTiming(); + SpigotTimings.checkIfActiveTimer.startTiming();
+ if ( !entity.isAddedToChunk() ) { + // Never safe to skip fireworks or entities not yet added to chunk
+ if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks ) {
+ SpigotTimings.checkIfActiveTimer.stopTiming(); + SpigotTimings.checkIfActiveTimer.stopTiming();
+ return true; + return true;
+ } + }

2
CraftBukkit-Patches/0049-Watchdog-Thread.patch
View File

@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000000 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@

11
CraftBukkit-Patches/0061-Particle-API.patch
View File

@@ -135,6 +135,17 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void playEffect(Location loc, Effect effect, int data) {
if (getHandle().playerConnection == null) return;
- int packetData = effect.getId();
- PacketPlayOutWorldEvent packet = new PacketPlayOutWorldEvent(packetData, new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()), data, false);
- getHandle().playerConnection.sendPacket(packet);
+ spigot().playEffect(loc, effect, data, 0, 0, 0, 0, 1, 1, Integer.MAX_VALUE);
}
@Override
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false ); server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
} }

2
CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View File

@@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener { @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState; public final boolean defaultActivationState;
public long activatedTick = 0; public long activatedTick = Integer.MIN_VALUE;
+ public boolean fromMobSpawner; + public boolean fromMobSpawner;
public void inactiveTick() { } public void inactiveTick() { }
// Spigot end // Spigot end

2
CraftBukkit-Patches/0152-Limit-TNT-Detonations-per-tick.patch
View File

@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.lastY = this.locY; this.lastY = this.locY;
this.lastZ = this.locZ; this.lastZ = this.locZ;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000004 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {