Commit graph

9275 commits

Author SHA1 Message Date
Spigot
6920d2c1f8 [Cleanup] Split the long hash changes into their own patch.
By: md_5 <md_5@live.com.au>
2013-03-23 09:31:28 +11:00
Spigot
da42840834 Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-60-gbfdb177
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-22 17:21:45 -05:00
Spigot
bc5eb3a011 Automatically update upstream versions. Bukkit-1.4.7-R1.0-34-g46234ff, CraftBukkit-1.4.7-R1.0-59-ge869277
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 23:41:39 -05:00
Spigot
64b5ed9e5c Automatically update upstream versions. Bukkit-1.4.7-R1.0-33-g34648c5, CraftBukkit-1.4.7-R1.0-57-g7e17c4e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 21:16:38 -05:00
Spigot
2b4768e91c Automatically update upstream versions. Bukkit-1.4.7-R1.0-32-gf62fbdb, CraftBukkit-1.4.7-R1.0-57-g7e17c4e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 17:01:37 -05:00
Spigot
b7451e3081 Automatically update upstream versions. Bukkit-1.4.7-R1.0-32-gf62fbdb, CraftBukkit-1.4.7-R1.0-56-gfbfbc31
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 14:31:44 -05:00
Spigot
815bf98bca Automatically update upstream versions. Bukkit-1.4.7-R1.0-31-g62cc82a, CraftBukkit-1.4.7-R1.0-55-g84a45ed
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 13:56:52 -05:00
Spigot
72dc4ac12e Stage DataWatcher & WatchableObject.
So that we may identify the exact cause of exceptions originating from these classes.

By: md_5 <md_5@live.com.au>
2013-03-21 17:01:03 +11:00
Spigot
0e364e9549 Automatically update upstream versions. Bukkit-1.4.7-R1.0-30-ge416362, CraftBukkit-1.4.7-R1.0-54-gff7c371
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 00:26:42 -05:00
Spigot
ad59157c8d Automatically update upstream versions. Bukkit-1.4.7-R1.0-30-ge416362, CraftBukkit-1.4.7-R1.0-53-g2305e00
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 18:11:41 -05:00
Spigot
c4165ee243 Merge pull request #24 from TehRainbowGuy/master
Updates spigot to 1.5.1
By: md-5 <md_5@live.com.au>
2013-03-20 15:53:34 -07:00
Spigot
18b5768f30 Automatically update upstream versions. Bukkit-1.4.7-R1.0-29-gd5caa86, CraftBukkit-1.4.7-R1.0-52-gea9f433
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 17:51:41 -05:00
Spigot
f370ab8784 Update to 1.5.1
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-03-20 21:54:12 +00:00
Spigot
9a3a09e79b Automatically update upstream versions. Bukkit-1.4.7-R1.0-28-g3d44b71, CraftBukkit-1.4.7-R1.0-51-ge66afce
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 16:31:44 -05:00
Spigot
d0aecbe5b8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-50-gd94f0e2
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 11:16:44 -05:00
Spigot
d192d9c166 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-49-g0950755
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 10:36:38 -05:00
Spigot
3801a14410 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-48-gdd11b36
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 09:46:53 -05:00
Spigot
25406815cd Update Bukkit version.
By: md_5 <md_5@live.com.au>
2013-03-20 16:52:18 +11:00
Spigot
48496790c8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-25-gad0ccae, CraftBukkit-1.4.7-R1.0-46-gaaa580b
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-19 21:57:28 -05:00
Spigot
bad273fe08 Update le patches so that they may henceforth apply cleanly without errors due to the last upstream commit.
By: md_5 <md_5@live.com.au>
2013-03-19 16:51:45 +11:00
Spigot
96d7ce81a7 Automatically update upstream versions. Bukkit-1.4.7-R1.0-24-gf213536, CraftBukkit-1.4.7-R1.0-45-g5c7d0bb
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-19 00:47:21 -05:00
Spigot
f2403de900 Automatically update upstream versions. Bukkit-1.4.7-R1.0-24-gf213536, CraftBukkit-1.4.7-R1.0-44-g82d40a0
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:52:23 -05:00
Spigot
79b9627fc8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-21-g5ce29c1, CraftBukkit-1.4.7-R1.0-43-gc9172a4
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:27:23 -05:00
Spigot
6f3f25f827 Automatically update upstream versions. Bukkit-1.4.7-R1.0-21-g5ce29c1, CraftBukkit-1.4.7-R1.0-42-g7b3cf23
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:22:26 -05:00
Spigot
95677bfd79 Automatically update upstream versions. Bukkit-1.4.7-R1.0-20-g8846f9e, CraftBukkit-1.4.7-R1.0-41-g5ebee02
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 18:27:23 -05:00
Spigot
a1483db9ca Automatically update upstream versions. Bukkit-1.4.7-R1.0-20-g8846f9e, CraftBukkit-1.4.7-R1.0-40-gd3cf25a
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 17:22:33 -05:00
Spigot
9e37fb091b Automatically update upstream versions. Bukkit-1.4.7-R1.0-19-g4a23f3f, CraftBukkit-1.4.7-R1.0-39-gd7fe50c
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 14:02:27 -05:00
Spigot
105f20085a Implement Travis
By: Zach Bruggeman <zbruggeman@me.com>
2013-03-17 12:04:04 -07:00
Spigot
3fc59cc0ee Automatically update upstream versions. Bukkit-1.4.7-R1.0-19-g4a23f3f, CraftBukkit-1.4.7-R1.0-38-ga73b6e1
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 13:17:36 -05:00
Spigot
082176c726 We should return "" not null for 'corrupt' signs.
By: md_5 <md_5@live.com.au>
2013-03-18 20:33:22 +11:00
Spigot
5ade077442 Prevent NPE in CraftSign
This commit prevents the constructor of CraftSign throwing an NPE when it cannot get the sign tile entity. Instead it will fallback to a 4 empty lined sign, and not try to do anything to those lines on .update().

@TheDgtl

By: md_5 <md_5@live.com.au>
2013-03-18 20:02:03 +11:00
Spigot
4baf879929 Automatically update upstream versions. Bukkit-1.4.7-R1.0-15-g51798af, CraftBukkit-1.4.7-R1.0-34-g484df2d
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 22:31:36 -05:00
Spigot
7ba25d1232 Automatically update upstream versions. Bukkit-1.4.7-R1.0-13-g51da39d, CraftBukkit-1.4.7-R1.0-33-g246aa19
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 20:21:36 -05:00
Spigot
57e4979e31 Automatically update upstream versions. Bukkit-1.4.7-R1.0-13-g51da39d, CraftBukkit-1.4.7-R1.0-32-gd7c4f89
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 13:06:47 -05:00
Spigot
cc6e8ab703 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.

By: md_5 <md_5@live.com.au>
2013-03-17 19:02:58 +11:00
Spigot
f4da5482df Deploy server again. wot eva
By: md_5 <md_5@live.com.au>
2013-03-17 12:27:11 +11:00
Spigot
3a7173aa1b Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-31-g4ff57b2
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 18:36:31 -05:00
Spigot
62e902bbcc Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-30-g55b5fb7
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 18:21:29 -05:00
Spigot
81d0524331 Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-29-ge46c007
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:31:32 -05:00
Spigot
fee63691d5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-29-ge46c007
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:16:32 -05:00
Spigot
d9002e97ca Update Netty to 4.0.0-Beta3 + reapply patches for new index info.
By: md_5 <md_5@live.com.au>
2013-03-17 09:14:16 +11:00
Spigot
36dd1f54b3 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-28-g35194cb
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:01:30 -05:00
Spigot
e146880bce Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-26-gc70dc7f
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 14:56:31 -05:00
Spigot
2a0e800253 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-25-g7b6d10e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 13:51:30 -05:00
Spigot
dccfbd2f01 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-24-g39576c5
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 13:31:36 -05:00
Spigot
6c4acd9b86 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-23-g80d8c9a
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 13:21:34 -05:00
Spigot
320fa58fd5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-22-g91d3c5e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 10:31:31 -05:00
Spigot
00efbf14ee Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-21-g85ce07a
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 09:51:30 -05:00
Spigot
70d134170a Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-20-gcac2f27
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 09:01:31 -05:00
Spigot
91d0d9cb3b Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-19-gb5d0b75
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 08:36:30 -05:00