ObsidianMC/Obsidian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9229 commits 47 branches 13 tags 225 MiB
Commit graph

9229 commits

This branch
This branch
All branches
Author SHA1 Message Date
EcoCityCraft
b9bae967eb Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-22-g91d3c5e 2013-03-16 10:31:31 -05:00
EcoCityCraft
cfdfac84d4 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-21-g85ce07a 2013-03-16 09:51:30 -05:00
EcoCityCraft
3ba062f78a Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-20-gcac2f27 2013-03-16 09:01:31 -05:00
EcoCityCraft
164602b9c8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-19-gb5d0b75 2013-03-16 08:36:30 -05:00
EcoCityCraft
e8d66833f9 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-18-g536aa38 2013-03-16 08:11:32 -05:00
EcoCityCraft
711cb0ee17 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-17-g5bb49e4 2013-03-16 07:41:32 -05:00
EcoCityCraft
f0e53b3436 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-16-g2f32ee4 2013-03-16 02:51:38 -05:00
md_5
184d1801e6 Fix isDamaged check for backwards compat 2013-03-16 11:57:39 +11:00
md_5
75f3e084ad Update Spigot to version 1.5. By using this build you agree to the following terms: (read next line) 
1) You will not hold SpigotMC responsible for any losses or damages incurred to you by using this build
2) You will report ALL bugs to SpigotMC and not other parties

Thanks for all the support and all parties who made this update possible; especially the awesome Spigot community. Sorry for the delay, but we had to fix some crucial bugs.

Regressions in this commit:
@mikeprimm's smarter chunk ticking patch has been removed as it prevents proper redstone and other block ticking logic.
 2013-03-16 10:24:13 +11:00
md_5
4c8d497932 Cleanup patch 2013-03-16 10:11:01 +11:00
md_5
b8cb45d88d Finish up the patches for 1.5. Now to test. 2013-03-16 09:09:32 +11:00
md_5
204e52aa82 Update Spigot API patches for 1.5 2013-03-16 08:41:11 +11:00
md_5
6e1c16aed8 Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p 2013-03-16 08:35:56 +11:00
EcoCityCraft
67dd91ffe6 Automatically update upstream versions. Bukkit-1.4.7-R1.0-9-gf9917ef, CraftBukkit-1.4.7-R1.0-15-g8e7c097 2013-03-15 14:31:33 -05:00
EcoCityCraft
9bcbd84c5b Automatically update upstream versions. Bukkit-1.4.7-R1.0-8-g9b0ecdf, CraftBukkit-1.4.7-R1.0-14-gd3d98a1 2013-03-15 13:41:40 -05:00
md_5
c297cddeb3 Remove ANSI patch from @jrtc27 for now, breaks log strip colours. 2013-03-15 20:49:12 +11:00
md_5
71978f3a0e Strip colours from logs when enabled. 2013-03-15 20:46:16 +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
ac5e97d4e5 Fix stripping colours in console logs. 2013-03-14 19:15:38 +11:00
md_5
e2cf0f7076 Rename ambiguous methods. 2013-03-14 16:32:15 +11:00
md_5
cd442c75db Reapply Container.java CraftBukkit patches, but with 1.5 logic. This fixes crafting and other issues. 2013-03-14 16:25:03 +11:00
Runemoro
a3978b527d Restart even if restart script is not found 2013-03-13 18:29:08 +11:00
EcoCityCraft
51c0ac53a8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-7-g6ea9162, CraftBukkit-1.4.7-R1.0-13-g437c575 2013-03-12 03:16:05 -05:00
md_5
a5cd0b0255 Undo all that encryption faff - NioBuffers arent for the job. 2013-03-12 17:26:16 +11:00
md_5
8ef8327c62 Another shot at encryption - thanks to all those testers, getting this right is important for BungeeCord! 2013-03-12 07:29:37 +11:00
EcoCityCraft
4d44a45149 Automatically update upstream versions. Bukkit-1.4.7-R1.0-6-gbcedb6b, CraftBukkit-1.4.7-R1.0-13-g437c575 2013-03-11 05:06:05 -05:00
md_5
bb34dba455 Take #12312 at faster encryption - a brave soul who doesnt mind a minute or 2 of downtime should try 2013-03-11 20:30:38 +11:00
md_5
825ae6c6ba Fix patch name. 2013-03-11 20:08:41 +11:00
md_5
72123ab9a3 Update snapshot version. 2013-03-11 19:14:10 +11:00
md_5
c8b552e908 Revert "Use blazingly fast encryption." 
This reverts commit 3d85d6b42f.
 2013-03-11 18:45:25 +11:00
md_5
3d85d6b42f Use blazingly fast encryption. 2013-03-11 09:53:34 +11:00
md_5
9c18df62b7 Thread safety. 
Adds thread safety for chunk load / unload methods.
 2013-03-07 20:12:53 +11:00
md_5
3c54fa95be Rename generated repo, and only deploy API, not server. 2013-03-07 17:49:54 +11:00
md-5
6a61d27c10 Quick fix damage event 2013-03-05 07:22:03 +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
md_5
c1b617ddc8 Fix errors in command block commands crashing the server. 2013-03-03 20:23:04 +11:00
md_5
0edbf1f0d8 CB has now merged the commits we pulled, so they can be removed. 2013-03-03 09:38:38 +11:00
EcoCityCraft
bfd6535946 Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-13-g437c575 2013-03-02 16:36:53 -06:00
EcoCityCraft
0ad29c88c0 Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-12-g0ebed52 2013-03-02 16:27:01 -06:00
EcoCityCraft
f16a7d5522 Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-10-g1ba48e7 2013-03-02 00:36:58 -06:00
md_5
36cebc5b7c Fix snapshot support. 2013-03-02 17:27:44 +11:00
md_5
ef9bf59cb6 Add configurable 13w09c protocol support. 2013-03-02 13:34:52 +11:00
md_5
6164c0bd18 Rename connection timing to accurately reflect what is actually being timed. 2013-03-02 10:40:13 +11:00
md_5
3345b8b177 Pull CraftBukkit #1007 from @jrtc27 - console formatting now replicates Minecraft properly. 2013-03-02 10:07:29 +11:00
md_5
0920b554f4 Pull CraftBukkit #1043 by @YLivay - addresses incorrect info returned to plugins in the dispense event. 2013-03-02 09:47:17 +11:00
md_5
0c77bff298 Pull CraftBukkit #1042 by @YLivay - addresses players glitching when the sleep whilst being marked as faux sleepers. 2013-03-02 09:43:59 +11:00
md_5
08fef878fa Pull CraftBukkit #1041 by @YLivay - address missing event for paintings breaking due to movement. 2013-03-02 09:38:27 +11:00
md_5
c454326dbf Pull CraftBukkit PR #1037 by @EdGruberman - fixes issues with plugins and items dropped by clicking outside an inventory. 2013-03-02 09:25:48 +11:00