Skip to content

Commit

Permalink
Update TacoSpigot to 1.9
Browse files Browse the repository at this point in the history
"It Compiles"
  • Loading branch information
Techcable committed Mar 7, 2016
2 parents c80c1e5 + c421fc2 commit a41f28f
Show file tree
Hide file tree
Showing 390 changed files with 10,235 additions and 14,801 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,15 @@ TacoSpigot-API
TacoSpigot-Server
Spigot-API
Spigot-Server
Paper-Server
Paper-API
PaperSpigot-Server
PaperSpigot-API
Bukkit
CraftBukkit

#Build System
Paperclip
work
build
Paperclip.jar
paperclip.jar
2 changes: 1 addition & 1 deletion BuildData
Submodule BuildData updated from 838b40 to 29cbde
2 changes: 1 addition & 1 deletion Bukkit
Submodule Bukkit updated from f517b6 to 5fa44f
8 changes: 4 additions & 4 deletions Bukkit-Patches/0001-POM-Changes.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 43ea4b8812178c2ba6431f28b9b492138335538e Mon Sep 17 00:00:00 2001
From 194ff8ab46d416cfbd1e1c09ae4ea53f84949ab9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes


diff --git a/pom.xml b/pom.xml
index a2bdfbc..70d5ff8 100644
index 204d681..6377570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,14 @@
Expand All @@ -16,7 +16,7 @@ index a2bdfbc..70d5ff8 100644
- <artifactId>bukkit</artifactId>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<version>1.9-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Bukkit</name>
Expand All @@ -29,5 +29,5 @@ index a2bdfbc..70d5ff8 100644
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
--
2.1.4
2.5.0

16 changes: 8 additions & 8 deletions Bukkit-Patches/0002-Spigot-Timings.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ec04cd369a98a9016ae00a8237a9b5b5835528ab Mon Sep 17 00:00:00 2001
From 8d138fbb2a8a9b588e673ee5855e662db585a34d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings
Expand All @@ -8,18 +8,18 @@ Adds performance tracking timings all around the Minecraft Server, and improves
Plugins can track their own timings with CustomTimingsHandler

diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d7b88d6..818bfd4 100644
index 2ace8c1..e61e50b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -542,6 +542,7 @@ public final class Bukkit {
@@ -546,6 +546,7 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
+ org.spigotmc.CustomTimingsHandler.reload(); // Spigot
}

/**
@@ -1138,4 +1139,9 @@ public final class Bukkit {
@@ -1156,4 +1157,9 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
Expand All @@ -30,10 +30,10 @@ index d7b88d6..818bfd4 100644
+ }
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c2f5de4..f4aa4a8 100644
index 60bcec8..5ca4321 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -932,4 +932,15 @@ public interface Server extends PluginMessageRecipient {
@@ -948,4 +948,15 @@ public interface Server extends PluginMessageRecipient {
*/
@Deprecated
UnsafeValues getUnsafe();
Expand Down Expand Up @@ -264,7 +264,7 @@ index a39ea5d..fc59aa3 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index e51658d..1a61ad3 100644
index 5a9e50d..c9d23d6 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -295,6 +295,7 @@ public final class SimplePluginManager implements PluginManager {
Expand Down Expand Up @@ -496,5 +496,5 @@ index 0000000..8d98297
+ }
+}
--
2.1.4
2.5.0

4 changes: 2 additions & 2 deletions Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2d16a2bd0871f1eb71f53b0f2949a99269f0dbda Mon Sep 17 00:00:00 2001
From 4523472589759a21480748098592974ad2792e03 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:31:20 +1100
Subject: [PATCH] Add PlayerItemDamageEvent
Expand Down Expand Up @@ -65,5 +65,5 @@ index 0000000..38a72ab
+ }
+}
--
2.1.4
2.5.0

13 changes: 6 additions & 7 deletions Bukkit-Patches/0004-BungeeCord-Support.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
From b351cd2f9562eff94b8a32f0f3cf1c066cd48690 Mon Sep 17 00:00:00 2001
From 0b286d348e11792e7da9b19a7fd02e623ed52aca Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support


diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1b54b48..ced2d6b 100644
index 723464b..6444fdf 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1076,4 +1076,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1272,4 +1272,22 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
@Deprecated
public void resetTitle();
+
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);

+ // Spigot start
+ public class Spigot extends Entity.Spigot
+ {
Expand Down Expand Up @@ -99,5 +98,5 @@ index 68834dd..4bc024f 100644
* Gets the current result of the login, as an enum
*
--
2.1.4
2.5.0

4 changes: 2 additions & 2 deletions Bukkit-Patches/0005-Add-Arrow-API.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5a6f3e6ac8d2c3b6a5600e89231a293af7ce03c8 Mon Sep 17 00:00:00 2001
From 161c7845321df654c9e26e47f251fa6c3997f82c 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
Expand Down Expand Up @@ -30,5 +30,5 @@ index e49eef0..e7a32f7 100644
+ Spigot spigot();
}
--
2.1.4
2.5.0

12 changes: 6 additions & 6 deletions Bukkit-Patches/0006-Add-Particle-API.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b46e9679728dcaa4782c6ce491897cfc8c978ab2 Mon Sep 17 00:00:00 2001
From 8dda3b718e25ff37aea6e807af0070d78a6d43a4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
Expand Down Expand Up @@ -271,10 +271,10 @@ index 2474a2d..37f29e2 100644
+ public enum Type {SOUND, VISUAL, PARTICLE}
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 127ad9d..6613286 100644
index 5cc1fec..5ce8f05 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1183,6 +1183,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1159,6 +1159,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);

Expand Down Expand Up @@ -332,10 +332,10 @@ index 127ad9d..6613286 100644
* Gets the world border for this world.
*
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index ced2d6b..c136208 100644
index 6444fdf..77ddf68 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1091,6 +1091,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1286,6 +1286,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
Expand Down Expand Up @@ -365,5 +365,5 @@ index 08aa71d..5217aec 100644
}
}
--
2.1.4
2.5.0

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
From e982d761707c7b217a88c4f9238feeaeaba4858d Mon Sep 17 00:00:00 2001
From 9d7dd9d5f9276fce1fd98a79a90d7a4b3523001e Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:01 -0500
Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent

Defines EntitySpawnEvent and SpawnerSpawnEvent. Adds BUKKIT-267 and BUKKIT-1559

diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
index 288e98b..8883157 100644
index c035b37..9dd8ef1 100644
--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
@@ -4,17 +4,13 @@ import org.bukkit.Location;
import org.bukkit.entity.CreatureType;
@@ -3,17 +3,13 @@ package org.bukkit.event.entity;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.Cancellable;
Expand All @@ -28,8 +28,8 @@ index 288e98b..8883157 100644
private final SpawnReason spawnReason;

public CreatureSpawnEvent(final LivingEntity spawnee, final SpawnReason spawnReason) {
@@ -28,29 +24,12 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
spawnReason = reason;
@@ -21,29 +17,12 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
this.spawnReason = spawnReason;
}

- public boolean isCancelled() {
Expand All @@ -55,10 +55,10 @@ index 288e98b..8883157 100644
- }
-
- /**
* Gets the type of creature being spawned.
* Gets the reason for why the creature is being spawned.
*
* @return A CreatureType value detailing the type of creature being
@@ -72,15 +51,6 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
* @return A SpawnReason value detailing the reason for the creature being
@@ -53,15 +32,6 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
return spawnReason;
}

Expand Down Expand Up @@ -216,5 +216,5 @@ index 0000000..1acb3c4
+ }
+}
--
2.1.4
2.5.0

4 changes: 2 additions & 2 deletions Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 246b47b22a286b0e8bd36082f636a6edeb3d7284 Mon Sep 17 00:00:00 2001
From f4a34eb093b24d141daa07889a425b6c5d5b7c76 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:53 +1000
Subject: [PATCH] Entity Mount and Dismount Events
Expand Down Expand Up @@ -108,5 +108,5 @@ index 0000000..16aa2a7
+ }
+}
--
2.1.4
2.5.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8a80ebccc9555a300c001caf8a8984f12a86f326 Mon Sep 17 00:00:00 2001
From 36c03b52a29710a08ab8c8a4aecdf00877847315 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 7 Jul 2013 10:32:05 -0400
Subject: [PATCH] InventoryClickEvent getClickedInventory
Expand Down Expand Up @@ -50,5 +50,5 @@ index 28198b8..3313d91 100644
*
* @return the slot type
--
2.1.4
2.5.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0244c6a138d2d14eebedef0b3fa06570d1772e87 Mon Sep 17 00:00:00 2001
From d42215ef49162229b53cdae06df8143f7d3b8692 Mon Sep 17 00:00:00 2001
From: Alex Bennett <alex.eugene.bennett@gmail.com>
Date: Thu, 11 Jul 2013 15:31:32 -0500
Subject: [PATCH] Added getAllSessionData() to the Conversation API.
Expand All @@ -24,5 +24,5 @@ index 4f33ff4..7390a77 100644
* this as a way to pass data through each Prompt as the conversation
* develops.
--
2.1.4
2.5.0

4 changes: 2 additions & 2 deletions Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f58f3bf04a2bb21880cc76e09196a57eddc44c6d Mon Sep 17 00:00:00 2001
From 6b81cd9d8cfc6fbc6046bd89aab7ca0b7ff83426 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 22 Jul 2013 19:09:43 +1000
Subject: [PATCH] Catch Conversation API Errors
Expand Down Expand Up @@ -30,5 +30,5 @@ index d4c1f6d..46912c8 100644

/**
--
2.1.4
2.5.0

8 changes: 4 additions & 4 deletions Bukkit-Patches/0012-Player-Collision-API.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 6cac32aab7e7270acc0c3a3802a833007301a755 Mon Sep 17 00:00:00 2001
From 8747c4a54e1c16d7e96a02212f2583f40d9d5523 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API


diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c136208..2d054ba 100644
index 77ddf68..146fbd4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1096,6 +1096,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1291,6 +1291,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
Expand Down Expand Up @@ -37,5 +37,5 @@ index c136208..2d054ba 100644

Spigot spigot();
--
2.1.4
2.5.0

4 changes: 2 additions & 2 deletions Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From cbb9593827fba7ecf040fab1fc0a0794a78345c2 Mon Sep 17 00:00:00 2001
From 7aef7e6c46ff1f2c9b6b348b817b7af04f4eb327 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:42:16 +1000
Subject: [PATCH] Expand Boolean Prompt Values
Expand All @@ -24,5 +24,5 @@ index 3f2c97f..81ef78c 100644
}

--
2.1.4
2.5.0

12 changes: 6 additions & 6 deletions Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From 3058e4ccec6de64c7c0a94fefecebaf76cae104c Mon Sep 17 00:00:00 2001
From d60f114d2e756c1757df92f70c3bf32a631f5a6d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:49:36 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability


diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index de7815f..7fb08af 100644
index 6dc7076..9f4d48b 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -342,4 +342,22 @@ public interface Entity extends Metadatable, CommandSender {
* @return if the custom name is displayed
@@ -356,4 +356,22 @@ public interface Entity extends Metadatable, CommandSender {
* @return whether the entity is glowing
*/
public boolean isCustomNameVisible();
boolean isGlowing();
+
+ // Spigot Start
+ public class Spigot
Expand All @@ -32,5 +32,5 @@ index de7815f..7fb08af 100644
+ // Spigot End
}
--
2.1.4
2.5.0

Loading

0 comments on commit a41f28f

Please sign in to comment.