Commit Graph

81 Commits

Author SHA1 Message Date
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
md_5
62a02a4422 Hopper cooldowns - patch #50! 2013-06-02 16:24:20 +10:00
md_5
bb85281118 Add additional particle API. Thanks thinkofdeath! 2013-06-02 16:15:22 +10:00
md_5
fc6cfcb21a Update Bungee support to new patch. This is breaking. 2013-06-02 15:22:22 +10:00
md_5
e9757fa533 Add a skeleton api impl to show how spigot specific APIs will be made 2013-06-02 15:15:15 +10:00
md_5
383f357e29 Rename some API patches 2013-06-02 11:22:30 +10:00
md_5
3e06c41ce4 Update timings patch for cleanup and better efficiency 2013-06-02 11:19:41 +10:00
md_5
6958c35844 Clean up the first two API patches 2013-06-02 10:45:39 +10:00
md_5
05db99ce17 Add better APIs for bungee raw IP 2013-05-21 20:45:44 +10:00
md_5
6fd3486dab Add IP for players raw IP address 2013-05-14 21:14:43 +10:00
md_5
51ed9f651d Update to latest upstream 2013-05-04 09:24:53 +10:00
md_5
89c99e9d28 [CAUTION] Initial 1.5.2 update - I have NOT had time to TEST. DO NOT use on production server WITHOUT TESTING FIRST. 2013-05-01 08:40:33 +10:00
md_5
b9d0fab579 [Experimental] Add connection multiplexer to allow many listen blocks. Secondary listen blocks are configured in bukkit.yml 2013-04-19 17:46:00 +10:00
md_5
079dc61259 Now that thats out the way.. 2013-04-13 17:14:56 +10:00
md_5
010f3ea2b0 Remove a fair chunk of existing patches now applied to CraftBukkit 2013-04-13 17:06:23 +10:00
md_5
7db53a4407 Add @hidendra 's pulls 2013-04-10 17:03:17 +10:00
md_5
d9c76252eb Remove stats completely from patches. 2013-04-10 14:08:33 +10:00