Commit Graph

97 Commits

Author SHA1 Message Date
Thinkofdeath
31f53fbbbe Upstream merge 2014-01-31 20:42:29 +00:00
brajo
9557f49051 Fix typo on /timings on message 2014-01-27 14:47:37 +00:00
md_5
9a280ecec9 Disable /timings on as it produces inaccurate results. 2014-01-25 08:45:00 +11:00
md_5
49f9f20d1c Add Spigot links. 2014-01-23 13:17:47 +11:00
md_5
80c8e1ac31 Don't disconnect player when we have no vanilla tab completions. 2014-01-21 15:32:54 +11:00
Thinkofdeath
6c36e5eff0 Add TILE_DUST to the particle API 2014-01-19 22:15:25 +00:00
md_5
65a4f51285 Upstream merge 2014-01-15 20:28:26 +11:00
Thinkofdeath
2b8293489e Fix Effect.TILE_BREAK
The particle's name got changed with @Grum 's tile -> block rename
2013-12-27 19:45:04 +00:00
md_5
db8db0b36b Fix tab completion for some Vanilla commands (reload, plugins, testfor, tell) Thanks @ams2990 2013-12-24 10:14:53 +11:00
md_5
6a98142bd5 Fix patch tree. 2013-12-22 10:06:06 +11:00
md_5
1c099a713b Upstream merge, nothing major. 2013-12-21 19:13:39 +11:00
md_5
e9cb6ec3c5 Upstream merge 2013-12-18 17:48:18 +11:00
Thinkofdeath
eafbb2a4c1 Add VanillaCommandWrapper which allows use of vanilla commands instead of Bukkit's versions 2013-12-18 10:33:58 +11:00
md_5
c8145fb896 Actually fix division by 0 in growth 2013-12-03 09:05:49 +11:00
md_5
31572d6c20 Update maven shade plugin so that newer maven versions (ie travis) will compile. 2013-12-03 08:21:58 +11:00
md_5
eb2ab6b421 Update mc-dev etc. 2013-12-01 15:14:03 +11:00
md_5
cdbe22b7c7 Update master to R2 as well. 2013-11-05 10:46:34 +11:00
md_5
f775c4dbd1 Upstream Merge 2013-10-24 21:23:24 +11:00
md_5
aa0536e414 Fix plugin message API exceptions throwing internal errors to the client. 2013-10-19 13:00:10 +11:00
md_5
8d428932b4 Fix up patch tree. 2013-10-09 18:22:37 +11:00
Ammar Askar
65e0f8e01f Pull in respawn API, thanks @ninja- 2013-10-08 18:56:05 +05:00
md_5
7509839cdf Update to CraftBukkit 1.6.4 2013-09-20 11:46:45 +10:00
md_5
1b854cbe28 Upstream merge + remove 3 pulled patches. 2013-09-12 10:20:02 +10:00
md_5
89720fa208 Upstream merge. 2013-09-08 08:42:56 +10:00
md_5
50e3212361 Our timings can cause the test contract to be violated, can't be fixed due to git being buggy when making a patch 2013-08-08 17:41:23 +10:00
md_5
bb752dd8e3 Add violations back to timings 2013-08-08 13:56:08 +10:00
md_5
e36ba8dd96 Upstream merge 2013-08-07 17:16:57 +10:00
DerFlash
edd0d42995 Add Getter for Entity Invulnerability 2013-08-03 19:54:36 +10:00
Alex Bennett
5a237b8e57 Expand Boolean Prompt Values 2013-08-03 19:42:55 +10:00
md_5
5eb704605d Add Player Collision API. Thanks to @lazertester and @mrapple for the implementation. 2013-08-03 19:27:26 +10:00
md_5
85480c7faa Fix timings reset throwing off depth. Thanks @Aikar 2013-08-03 18:56:22 +10:00
md_5
381a40a50a Upstream merge 2013-08-03 18:45:50 +10:00
md_5
5d31ee288a Should probably do an upstream update. 2013-07-24 19:33:10 +10:00
md_5
755645cc23 Catch conversation API errors so that plugins don't silently malfunction. 2013-07-22 19:10:02 +10:00
Alex Bennett
855d97b89a Added getAllSessionData() to the Conversation API. 2013-07-12 11:21:22 +10:00
md_5
6b60db4272 Update to latest CraftBukkit and refresh all patch hashes - somehow InventoryClickEvent patch got applied twice. 2013-07-11 11:31:30 +10:00
md_5
9018b1d7ba Update Spigot to Minecraft 1.6.2 2013-07-09 10:31:10 +10:00
Aikar
4ec29f51dc Add InventoryClickEvent.getClickedInventory. Adds BUKKIT-4495
Plugins currently have to do the logic themselves on the raw slot ID
in order to determine the inventory clicked. This provides the logic for plugins to
readily identify which inventory was clicked.
2013-07-08 14:59:17 +10:00
md_5
b5ee9871fb Add 1.6 Potion Effects. Thanks @bloodsplat for pointing this out. 2013-07-08 12:37:44 +10:00
md_5
cd02250065 Did someone say console command completion? These commits were authored by @quickwango and come from Bukkit/Bukkit#868 and Bukkit/CraftBukkit#1151 2013-07-06 09:40:00 +10:00
md_5
26f85d2572 Update Depends
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
2013-07-04 20:05:41 +10:00
md_5
fec1763e6d Switch index length check around to prevent crashes 2013-07-04 12:11:17 +10:00
Ammar Askar
76e002c2f5 Fix merge conflict from upstream change 2013-07-03 11:40:24 +05:00
md_5
ab1e1a2a5a Add Entity Mount and Dismount Events - very useful for horses! Thanks @lazertester for the idea! 2013-07-02 20:33:10 +10:00
md_5
011b0d5923 Update Spigot-API to 1.6 2013-07-02 12:36:48 +10:00
md_5
0c7072f790 Refresh the hashes of all our patches so they are nicely in sync after our new RB. 2013-06-16 21:45:21 +10:00
Andy Shulman
468ea97414 Implemented Bukkit and CraftBukkit pulls #859 and #1137 respectively 2013-06-15 19:10:13 +10:00
md_5
2083a98e7b Update versions. 2013-06-15 19:08:22 +10:00
md_5
9bb9e64939 != -> ==, fix timings 2013-06-04 17:58:08 +10:00
md_5
fced81e629 Just under 2 months for CB to pull - new record! 2013-06-04 17:44:12 +10:00