CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source
This commit is contained in:
Thinkofdeath 2014-01-31 20:42:29 +00:00
parent 16ea6a1c25
commit 31f53fbbbe
23 changed files with 113 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit 4b0e6ba61132381795c9dbed32b0bc2689f9e755
Subproject commit a621d1683a1070043cc7febc293caf5f60615182

17
Bukkit-Patches/0007-Add-Arrow-API.patch
View File

@ -1,20 +1,17 @@
From c076b0297466b1be8c4c9c6a622e7f0e30a4300f Mon Sep 17 00:00:00 2001
From 3368da5f94185d954c7937a2cf3df8f53adeb118 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:08:24 +1000
Subject: [PATCH] Add Arrow API
diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
index 26d3473..676fe2b 100644
index e49eef0..e7a32f7 100644
--- a/src/main/java/org/bukkit/entity/Arrow.java
+++ b/src/main/java/org/bukkit/entity/Arrow.java
@@ -3,4 +3,22 @@ package org.bukkit.entity;
/**
* Represents an arrow.
@@ -39,4 +39,20 @@ public interface Arrow extends Projectile {
* @param critical whether or not it should be critical
*/
-public interface Arrow extends Projectile {}
+public interface Arrow extends Projectile
+{
public void setCritical(boolean critical);
+
+ public class Spigot extends Entity.Spigot
+ {
@ -31,7 +28,7 @@ index 26d3473..676fe2b 100644
+ }
+
+ Spigot spigot();
+}
}
--
1.8.3.2
1.8.4.msysgit.0

2
CraftBukkit

@ -1 +1 @@
Subproject commit 15b04d84b6661e2aa4f891d60e3e13865b776e90
Subproject commit 88d138fc4387ec938f1041d1c6f75e32267e66ac

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

@ -1,4 +1,4 @@
From 59e56445206cfea682370a83a2436be36ff187ff Mon Sep 17 00:00:00 2001
From 7a2be87999849e59b8ab48ec8e484a107ec49117 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -142,10 +142,10 @@ index 2f06c8e..bec994f 100644
<execution>
<phase>package</phase>
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f3e5200..596bfcf 100644
index d27ab8c..e4d7a05 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -226,7 +226,7 @@ public final class CraftServer implements Server {
@@ -225,7 +225,7 @@ public final class CraftServer implements Server {
loadIcon();
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
@ -168,5 +168,5 @@ index f905d17..9304637 100644
if (stream != null) {
--
1.8.3.2
1.8.4.msysgit.0

14
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View File

@ -1,11 +1,11 @@
From ca8e45f5c2141df3b4d582b22662715a2f1fffe1 Mon Sep 17 00:00:00 2001
From 8ee072a2329fa1ab8b7540a18c633dd8dee8d549 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3d0383d..c16413a 100644
index 2c1fbb5..965d860 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1280,4 +1280,14 @@ public class CraftWorld implements World {
@ -24,12 +24,12 @@ index 3d0383d..c16413a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index b46b9c4..a386001 100644
index 4c319a7..328c73f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -40,4 +40,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
public EntityType getType() {
return EntityType.ARROW;
@@ -71,4 +71,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
public void _INVALID_setShooter(LivingEntity shooter) {
getHandle().shooter = ((CraftLivingEntity) shooter).getHandle();
}
+
+ // Spigot start
@ -84,5 +84,5 @@ index 9935e7a..6b7fcfc 100644
+ // Spigot end
}
--
1.8.3.2
1.8.4.msysgit.0

12
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View File

@ -1,4 +1,4 @@
From e97da5da5fb74f5212a6075c94adf147c31824ab Mon Sep 17 00:00:00 2001
From 57b4275cba2ec0d77c900c51383f3e41375df5b9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -54,10 +54,10 @@ index f850a0f..cd529ec 100644
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 596bfcf..fc5d8a6 100644
index e4d7a05..d5c1ffb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -232,8 +232,10 @@ public final class CraftServer implements Server {
@@ -231,8 +231,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@ -70,7 +70,7 @@ index 596bfcf..fc5d8a6 100644
}
private File getConfigFile() {
@@ -583,6 +585,7 @@ public final class CraftServer implements Server {
@@ -582,6 +584,7 @@ public final class CraftServer implements Server {
playerList.getIPBans().load();
playerList.getNameBans().load();
@ -78,7 +78,7 @@ index 596bfcf..fc5d8a6 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -597,11 +600,13 @@ public final class CraftServer implements Server {
@@ -596,11 +599,13 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
@ -296,5 +296,5 @@ index 0000000..961ddb4
+ }
+}
--
1.8.3.2
1.8.4.msysgit.0

16
CraftBukkit-Patches/0014-Improved-Timings-System.patch
View File

@ -1,4 +1,4 @@
From 5281adb89f494f0ae890612a90cb218e69ea7af0 Mon Sep 17 00:00:00 2001
From 9aa2c9cab36f62efe112ad012cd715aeedfb4609 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
@ -26,7 +26,7 @@ index 9c99177..b88f75c 100644
// CraftBukkit start - If we didn't need to load the chunk run the callback now
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index dc0abc5..3d6aeff 100644
index f74d937..ff07aa7 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
@ -37,16 +37,16 @@ index dc0abc5..3d6aeff 100644
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.painting.PaintingBreakByEntityEvent;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -110,6 +111,8 @@ public abstract class Entity {
public EnumEntitySize at;
@@ -111,6 +112,8 @@ public abstract class Entity {
public boolean valid; // CraftBukkit
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
+ public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
+
public int getId() {
return this.id;
}
@@ -423,6 +426,8 @@ public abstract class Entity {
@@ -424,6 +427,8 @@ public abstract class Entity {
return;
}
// CraftBukkit end
@ -55,7 +55,7 @@ index dc0abc5..3d6aeff 100644
if (this.Y) {
this.boundingBox.d(d0, d1, d2);
this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
@@ -731,6 +736,7 @@ public abstract class Entity {
@@ -732,6 +737,7 @@ public abstract class Entity {
this.world.methodProfiler.b();
}
@ -146,7 +146,7 @@ index 6a01982..2519af6 100644
public boolean getAllowNether() {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 29335ea..d0ea17a 100644
index ee6b0a1..d9e64a3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -917,6 +917,7 @@ public class PlayerConnection implements PacketPlayInListener {
@ -547,5 +547,5 @@ index 55db3ff..7d294c0 100644
}
--
1.8.3.2
1.8.4.msysgit.0

16
CraftBukkit-Patches/0017-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From d9baaf527c0e4b45fdd7e79047c75d0be14dc42e Mon Sep 17 00:00:00 2001
From bcd783b672729f05034d1e8f380d05b99cb27ac2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3d6aeff..3e3d935 100644
index ff07aa7..adf20d9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -88,7 +88,7 @@ public abstract class Entity {
@ -21,9 +21,9 @@ index 3d6aeff..3e3d935 100644
public int noDamageTicks;
private boolean justCreated;
protected boolean fireProof;
@@ -111,7 +111,13 @@ public abstract class Entity {
public EnumEntitySize at;
@@ -112,7 +112,13 @@ public abstract class Entity {
public boolean valid; // CraftBukkit
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
+ // Spigot start
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@ -35,7 +35,7 @@ index 3d6aeff..3e3d935 100644
public int getId() {
return this.id;
@@ -138,7 +144,12 @@ public abstract class Entity {
@@ -139,7 +145,12 @@ public abstract class Entity {
this.setPosition(0.0D, 0.0D, 0.0D);
if (world != null) {
this.dimension = world.worldProvider.dimension;
@ -85,10 +85,10 @@ index 36ed831..7ddca48 100644
super(world);
}
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 4b3e5dd..3fd3de9 100644
index 5887ee8..367bcc9 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -14,7 +14,7 @@ public class EntityArrow extends Entity implements IProjectile {
@@ -15,7 +15,7 @@ public class EntityArrow extends Entity implements IProjectile {
private int f = -1;
private Block g;
private int h;
@ -477,5 +477,5 @@ index 49a5b7a..1d95207 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0020-Faster-UUID-for-entities.patch
View File

@ -1,4 +1,4 @@
From 91fc1d0f8ae1695094f95e8a3bfc4c3975623bc5 Mon Sep 17 00:00:00 2001
From 1bb989ea03ed1de28c3350d7a19e5695f62b5915 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 17 Mar 2013 19:02:50 +1100
Subject: [PATCH] Faster UUID for entities
@ -6,10 +6,10 @@ Subject: [PATCH] Faster UUID for entities
It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3e3d935..a3a8750 100644
index adf20d9..43fee78 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -138,7 +138,7 @@ public abstract class Entity {
@@ -139,7 +139,7 @@ public abstract class Entity {
this.random = new Random();
this.maxFireTicks = 1;
this.justCreated = true;
@ -19,5 +19,5 @@ index 3e3d935..a3a8750 100644
this.world = world;
this.setPosition(0.0D, 0.0D, 0.0D);
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch
View File

@ -1,4 +1,4 @@
From 35e0f88aaf851cc197387b047c01a3c652ce8699 Mon Sep 17 00:00:00 2001
From c35c4a094e30b6ef218081eae54e0250376ec141 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files
@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
public static synchronized RegionFile a(File file1, int i, int j) {
File file2 = new File(file1, "region");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fc5d8a6..83b0da0 100644
index d5c1ffb..dd02f8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -41,6 +41,8 @@ import net.minecraft.server.MinecraftServer;
@ -30,7 +30,7 @@ index fc5d8a6..83b0da0 100644
import net.minecraft.server.ServerNBTManager;
import net.minecraft.server.WorldLoaderServer;
import net.minecraft.server.WorldManager;
@@ -851,6 +853,30 @@ public final class CraftServer implements Server {
@@ -850,6 +852,30 @@ public final class CraftServer implements Server {
worlds.remove(world.getName().toLowerCase());
console.worlds.remove(console.worlds.indexOf(handle));
@ -62,5 +62,5 @@ index fc5d8a6..83b0da0 100644
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0029-Implement-Arrow-API.patch
View File

@ -1,14 +1,14 @@
From c2c024a52073c2ad367c4a5428604c88432a4404 Mon Sep 17 00:00:00 2001
From a20bd8901bb291e21f5dbb4f64b3f34267c00baa Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index a386001..236384f 100644
index 328c73f..839b88e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -44,6 +44,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
@@ -75,6 +75,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
// Spigot start
private final Arrow.Spigot spigot = new Arrow.Spigot()
{
@ -27,5 +27,5 @@ index a386001..236384f 100644
public Arrow.Spigot spigot()
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0034-Do-Not-Search-for-Offline-Players.patch
View File

@ -1,4 +1,4 @@
From 748c2f52c6590bca633e18a98674b3a684acfd0c Mon Sep 17 00:00:00 2001
From 827a1584998eff24da02f7369d56ed9b7cd1e5fe Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 08:20:26 +1000
Subject: [PATCH] Do Not Search for Offline Players
@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 83b0da0..b60ca66 100644
index dd02f8b..1792828 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1135,7 +1135,7 @@ public final class CraftServer implements Server {
@@ -1134,7 +1134,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {
@ -19,5 +19,5 @@ index 83b0da0..b60ca66 100644
public OfflinePlayer getOfflinePlayer(String name, boolean search) {
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0036-Allow-Disabling-of-Command-TabComplete.patch
View File

@ -1,14 +1,14 @@
From a5df96e3cb33d275fa20fb9b1a515718e249e78f Mon Sep 17 00:00:00 2001
From 47b68c9e9aedc25df26b5e225026027de32075a2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b60ca66..4f03183 100644
index 1792828..141de1e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1400,6 +1400,13 @@ public final class CraftServer implements Server {
@@ -1399,6 +1399,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message) {
@ -38,5 +38,5 @@ index 4d15f8b..8764045 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

16
CraftBukkit-Patches/0037-Configurable-Messages.patch
View File

@ -1,15 +1,15 @@
From 4e5abe2fe18bee263c2fc08f7bde8f6ef49e0ee3 Mon Sep 17 00:00:00 2001
From 8a2ee852f09290306e43b9fcb8bfd3bef006e429 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index b7f6775..b96e2ef 100644
index a02c83f..9533fd1 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -19,11 +19,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
ChatComponentText chatcomponenttext;
@@ -64,11 +64,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
// CraftBukkit end
if (packethandshakinginsetprotocol.d() > 4) {
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.2");
@ -45,10 +45,10 @@ index 1725bba..5174602 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4f03183..0ac8f52 100644
index 141de1e..89fb069 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -549,11 +549,7 @@ public final class CraftServer implements Server {
@@ -548,11 +548,7 @@ public final class CraftServer implements Server {
return true;
}
@ -62,7 +62,7 @@ index 4f03183..0ac8f52 100644
return false;
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 8764045..8b7c73e 100644
index 8764045..0ab2ec3 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -12,6 +12,7 @@ import java.util.Map;
@ -103,5 +103,5 @@ index 8764045..8b7c73e 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

10
CraftBukkit-Patches/0043-Entity-Mount-and-Dismount-Events.patch
View File

@ -1,14 +1,14 @@
From ff8ebc0965a86af74237fb0c55c32e6b2e55c7d2 Mon Sep 17 00:00:00 2001
From ba520c2a1112cd05f754cb7d3d0cc7c4339db980 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:49 +1000
Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a3a8750..9ef9f88 100644
index 43fee78..d8d5739 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1451,6 +1451,7 @@ public abstract class Entity {
@@ -1452,6 +1452,7 @@ public abstract class Entity {
}
}
// CraftBukkit end
@ -16,7 +16,7 @@ index a3a8750..9ef9f88 100644
this.setPositionRotation(this.vehicle.locX, this.vehicle.boundingBox.b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
this.vehicle.passenger = null;
@@ -1486,6 +1487,17 @@ public abstract class Entity {
@@ -1487,6 +1488,17 @@ public abstract class Entity {
}
}
// CraftBukkit end
@ -47,5 +47,5 @@ index c12a08f..7442943 100644
Entity originalVehicle = this.vehicle;
// First statement moved down, second statement handled in parent method.
--
1.8.3.2
1.8.4.msysgit.0

12
CraftBukkit-Patches/0056-Don-t-Special-Case-X-Move-Value.patch
View File

@ -1,11 +1,11 @@
From 00c63d4d0d013c836c4ab73c88cfb756ed7b4aa6 Mon Sep 17 00:00:00 2001
From 35c118d7278bdca1671c45a5e8f6ab1a99ad5ee3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 6 Oct 2013 17:36:28 +1100
Subject: [PATCH] Don't Special Case X Move Value
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6e54ad1..e88adfa 100644
index 0c85c57..0cf3c98 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -105,6 +105,7 @@ public class PlayerConnection implements PacketPlayInListener {
@ -16,7 +16,7 @@ index 6e54ad1..e88adfa 100644
// For the PacketPlayOutBlockPlace hack :(
Long lastPacket;
@@ -222,7 +223,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -229,7 +230,7 @@ public class PlayerConnection implements PacketPlayInListener {
this.lastPitch = to.getPitch();
// Skip the first time we do this
@ -25,7 +25,7 @@ index 6e54ad1..e88adfa 100644
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
this.server.getPluginManager().callEvent(event);
@@ -246,7 +247,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -253,7 +254,7 @@ public class PlayerConnection implements PacketPlayInListener {
this.justTeleported = false;
return;
}
@ -33,7 +33,7 @@ index 6e54ad1..e88adfa 100644
+ } else { hasMoved = true; } // Spigot - Better Check!
}
if (Double.isNaN(packetplayinflying.x) || Double.isNaN(packetplayinflying.y) || Double.isNaN(packetplayinflying.z) || Double.isNaN(packetplayinflying.stance)) {
if (this.checkMovement && !this.player.dead) {
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0059-Arrow-Despawn-Rate.patch
View File

@ -1,14 +1,14 @@
From 4f5bd8af4b80ff6e6ec6cc5b639762cac9eaf1b2 Mon Sep 17 00:00:00 2001
From 0f546eff1ddbd59635860defa0669ee356214fd7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 14 Oct 2013 19:20:10 +1100
Subject: [PATCH] Arrow Despawn Rate
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 3fd3de9..a49519b 100644
index 367bcc9..7c9780a 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -141,7 +141,7 @@ public class EntityArrow extends Entity implements IProjectile {
@@ -144,7 +144,7 @@ public class EntityArrow extends Entity implements IProjectile {
if (block == this.g && i == this.h) {
++this.j;
@ -34,5 +34,5 @@ index 72aabff..d4e8bf4 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

12
CraftBukkit-Patches/0062-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From c2948884ea9ec5d3a413a650899d358e29f26792 Mon Sep 17 00:00:00 2001
From 8ee5fd0371c74a972cf943018b8995dd650530ae Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support
Provides support for IP forwarding via BungeeCord.
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index b96e2ef..fe2098e 100644
index 9533fd1..6098eb5 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -28,6 +28,19 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -73,6 +73,19 @@ public class HandshakeListener implements PacketHandshakingInListener {
this.b.a((IChatBaseComponent) chatcomponenttext);
} else {
this.b.a((PacketListener) (new LoginListener(this.a, this.b)));
@ -82,7 +82,7 @@ index 8f829bb..6b2fbb9 100644
+ // Spigot End
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5219468..3c17e2f 100644
index f8e43d1..7eb95e2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1261,6 +1261,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -99,7 +99,7 @@ index 5219468..3c17e2f 100644
{
return getHandle().collidesWithEntities;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 4152452..a43c373 100644
index 2ea1be7..08bd5ba 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -181,4 +181,14 @@ public class SpigotConfig
@ -118,5 +118,5 @@ index 4152452..a43c373 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

12
CraftBukkit-Patches/0073-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
View File

@ -1,4 +1,4 @@
From caef5c99c37e68d746b563cc248943463a85b85f Mon Sep 17 00:00:00 2001
From 42df6ba4080ca38d5f94a1a44d5f25b23044d70f Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:32:15 +1100
Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
@ -32,10 +32,10 @@ index e63f17c..e58be15 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0ac8f52..1648d0e 100644
index 89fb069..b482592 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -548,6 +548,12 @@ public final class CraftServer implements Server {
@@ -547,6 +547,12 @@ public final class CraftServer implements Server {
if (commandMap.dispatch(sender, commandLine)) {
return true;
}
@ -48,7 +48,7 @@ index 0ac8f52..1648d0e 100644
sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
@@ -1403,15 +1409,27 @@ public final class CraftServer implements Server {
@@ -1402,15 +1408,27 @@ public final class CraftServer implements Server {
}
// Spigot End
@ -80,7 +80,7 @@ index 0ac8f52..1648d0e 100644
public List<String> tabCompleteChat(Player player, String message) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 19f2822..56767ac 100644
index cfddd28..ca2e054 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,7 @@ import java.io.IOException;
@ -318,5 +318,5 @@ index 0000000..a6c76cc
+ }
+}
--
1.8.3.2
1.8.4.msysgit.0

10
CraftBukkit-Patches/0078-Save-ticks-lived-to-nbttag.patch
View File

@ -1,14 +1,14 @@
From 380d4150ebcf38e7ff9da7e16ceb864588f0dbf8 Mon Sep 17 00:00:00 2001
From 7c5598ef88c5e69e950876571200323d7ea9df0f Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9ef9f88..84bac83 100644
index d8d5739..5826b50 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1131,6 +1131,7 @@ public abstract class Entity {
@@ -1132,6 +1132,7 @@ public abstract class Entity {
nbttagcompound.setLong("WorldUUIDLeast", this.world.getDataManager().getUUID().getLeastSignificantBits());
nbttagcompound.setLong("WorldUUIDMost", this.world.getDataManager().getUUID().getMostSignificantBits());
nbttagcompound.setInt("Bukkit.updateLevel", CURRENT_LEVEL);
@ -16,7 +16,7 @@ index 9ef9f88..84bac83 100644
// CraftBukkit end
this.b(nbttagcompound);
if (this.vehicle != null) {
@@ -1199,6 +1200,8 @@ public abstract class Entity {
@@ -1200,6 +1201,8 @@ public abstract class Entity {
if (this instanceof EntityLiving) {
EntityLiving entity = (EntityLiving) this;
@ -26,5 +26,5 @@ index 9ef9f88..84bac83 100644
if (entity instanceof EntityTameableAnimal && !isLevelAtLeast(nbttagcompound, 2) && !nbttagcompound.getBoolean("PersistenceRequired")) {
EntityInsentient entityinsentient = (EntityInsentient) entity;
--
1.8.3.2
1.8.4.msysgit.0

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

@ -1,14 +1,14 @@
From d7657d89d975e4db8e20fe01b80182a64ad0d0e9 Mon Sep 17 00:00:00 2001
From b05fe466fbccec76278a85a15ea7ac9866e12f3b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 22 Dec 2013 20:58:02 +1100
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 84bac83..e147244 100644
index 5826b50..69331ff 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -116,6 +116,7 @@ public abstract class Entity {
@@ -117,6 +117,7 @@ public abstract class Entity {
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
public long activatedTick = 0;
@ -67,5 +67,5 @@ index e7cb99d..018ec18 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

10
CraftBukkit-Patches/0094-Support-vanilla-s-direction-tag-on-fireballs.patch
View File

@ -1,14 +1,14 @@
From 4398d4b87554715e4b93771a18390ea1580d380b Mon Sep 17 00:00:00 2001
From d6540ef8e196aadbd34069462f569ef165cc476e Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sat, 18 Jan 2014 14:27:03 +0000
Subject: [PATCH] Support vanilla's direction tag on fireballs
diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
index 82da554..d23d178 100644
index 939de5d..436e6a1 100644
--- a/src/main/java/net/minecraft/server/EntityFireball.java
+++ b/src/main/java/net/minecraft/server/EntityFireball.java
@@ -198,6 +198,8 @@ public abstract class EntityFireball extends Entity {
@@ -199,6 +199,8 @@ public abstract class EntityFireball extends Entity {
nbttagcompound.setByte("inGround", (byte) (this.i ? 1 : 0));
// CraftBukkit - Fix direction being mismapped to invalid variables
nbttagcompound.set("power", this.a(new double[] { this.dirX, this.dirY, this.dirZ}));
@ -17,7 +17,7 @@ index 82da554..d23d178 100644
}
public void a(NBTTagCompound nbttagcompound) {
@@ -214,6 +216,13 @@ public abstract class EntityFireball extends Entity {
@@ -215,6 +217,13 @@ public abstract class EntityFireball extends Entity {
this.dirY = nbttaglist.d(1);
this.dirZ = nbttaglist.d(2);
// CraftBukkit end
@ -32,5 +32,5 @@ index 82da554..d23d178 100644
this.die();
}
--
1.8.3.2
1.8.4.msysgit.0

22
CraftBukkit-Patches/0106-Correctly-set-arrows-current-block.patch
View File

@ -1,22 +0,0 @@
From 8b2025cdcc8dd48c864b35da84e170674a3a7ae8 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Thu, 30 Jan 2014 20:39:07 +0000
Subject: [PATCH] Correctly set arrows' current block
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index a49519b..49e61aa 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -277,7 +277,7 @@ public class EntityArrow extends Entity implements IProjectile {
this.d = movingobjectposition.b;
this.e = movingobjectposition.c;
this.f = movingobjectposition.d;
- this.g = block;
+ this.g = this.world.getType( this.d, this.e, this.f ); // Spigot - Set to correct block
this.h = this.world.getData(this.d, this.e, this.f);
this.motX = (double) ((float) (movingobjectposition.pos.c - this.locX));
this.motY = (double) ((float) (movingobjectposition.pos.d - this.locY));
--
1.8.4.msysgit.0