Commit graph

124 Commits

Autor SHA1 Nachricht Datum
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
md_5
0e9aa34299 [Cosmetic] Update patches to be generated with latest stable git. 2013-04-10 12:36:11 +10:00
md_5
87f4ca0e82 remove no longer applying / pulled meta patches 2013-04-04 22:52:57 -05:00
Ammar Askar
1fdfed1fb9 Update for upstream version change 2013-04-04 15:58:51 +05:00
Hudson
acc7e2172b revert changes to disabled plugins and scheduler.
sorry for messy commit,doing via tablet on ssh
md_5
2013-04-03 02:20:29 -05:00
md_5
fa4499b65f Add a TON of metadata speed / memory fixes and improvements, courtesy of @crast 2013-03-23 10:30:53 +11:00
Benjamin James Harrison-Sims
49fd03bf60 Update to 1.5.1 2013-03-20 22:13:12 +00:00
md_5
204e52aa82 Update Spigot API patches for 1.5 2013-03-16 08:41:11 +11:00
md_5
b8d6b349b9 Remove extra event debug. Doesn't help + issue is already identified 2013-03-15 07:20:41 +11:00
md_5
e6da53b4c4 Try harder to print debug. 2013-03-14 20:52:32 +11:00
md_5
f34560ad84 Add debug code for event exceptions. 2013-03-14 20:37:44 +11:00
md_5
2faef00909 Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be. 2013-03-04 18:49:59 +11:00
Aikar
e9950b70d3 Overhaul to Timings and Entity Activation Range
This greatly extends the timings improvements I've done in recent commits, and brings timings to fully cover the entire tick.
The timings system also now tracks when specific timings causes the server to lose TPS.
The timings are also able to be turned on "on demand", meaning you do not need to restart the server to enable them.

This commit also overhauls the Entity Activation Range feature, fixing bugs, adding more immunities, and improving the performance of it.
It also fixes a regression with a recent Spigot commit that broke the entire Entity Activation Range feature.

This commit had to move the Tick Loop patch before timings because there was a change done there to time the entire tick, so lots of renames.

These 2 commits had to be bundled together to simplify applying them and reduce redundant conflict resolution.
2013-02-27 07:29:33 +11:00
md_5
20d7972801 Add aikar.co url too 2013-02-23 09:52:23 +11:00
md_5
9c7cbd37c9 Add paste flag to timings. 2013-02-23 09:33:01 +11:00
md_5
125729df15 Remove TagAPI patches. 2013-02-22 19:30:23 +11:00
md_5
59ccb11830 TagAPI is installed, I swear. 2013-02-20 20:16:54 +11:00
md_5
7b4bba6b3b Actually use the parent pom. 2013-02-03 09:54:16 +11:00
md_5
5853e18f40 Just use the parent pom. 2013-02-03 09:48:23 +11:00
md_5
277b59e4b9 Update POM changes to individual patches. 2013-02-03 09:38:54 +11:00
md_5
5efea6f794 Only nag if we are finding for the first time.. 2013-02-02 18:11:59 +11:00
md_5
b8994aff61 Abuse plugins which embed metrics in the default location. 2013-02-02 16:41:52 +11:00
md_5
37dc2fc1c4 Plugins break when the intended behaviour is put into place, because for some reason they are all packaging the same classes, an inherently unsafe operation in the case that the classes are loaded at the same time by multiple classloaders - hence we are removing safety from the loaders for now until a correct solution can be put in place. 2013-02-02 16:30:39 +11:00
md_5
cd35b5e5b0 Update to CraftBukkit 1.4.7-R1 2013-01-31 16:56:47 +11:00
md_5
cc5229ad6d Well, mike was right about deadlocks. 2013-01-25 11:35:20 +11:00
md_5
0c9154899b Make the plugin classloader a bit more thread safe to prevent class not found errors when a class is loaded at the same time from another thread. 2013-01-24 09:33:34 +11:00
md_5
648a5d145b Aikar is backwards, AND likes Java 7 2013-01-19 19:32:06 +11:00
md_5
84f611144b Add Aikar's timings patches. 2013-01-19 19:28:14 +11:00
md_5
48f3195237 Phew. I think that is 1.4.7 done 2013-01-18 09:27:26 +11:00
md_5
ec1ec77382 Rebuild all patches for 1.4.7 2013-01-18 08:58:06 +11:00
md_5
9abbfe5f39 Re add chunk snc lock and update patch files. 2013-01-16 11:32:20 +11:00
md_5
6222297784 Initial commit - hello future of Spigot! 2013-01-15 12:23:17 +11:00