Commit Graph

2583 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
b949532022 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-18-g536aa38
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 08:11:32 -05:00
a43f67431c Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-17-g5bb49e4
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 07:41:32 -05:00
f9b3a1f67b Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-16-g2f32ee4
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 02:51:38 -05:00
1218987001 Fix isDamaged check for backwards compat
By: md_5 <md_5@live.com.au>
2013-03-16 11:57:39 +11:00
5e01ba90c1 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.

By: md_5 <md_5@live.com.au>
2013-03-16 10:17:00 +11:00
78b59cb9ef Cleanup patch
By: md_5 <md_5@live.com.au>
2013-03-16 10:11:01 +11:00
8cd6af53fe Finish up the patches for 1.5. Now to test.
By: md_5 <md_5@live.com.au>
2013-03-16 09:08:53 +11:00
12afb9956e Update Spigot API patches for 1.5
By: md_5 <md_5@live.com.au>
2013-03-16 08:39:54 +11:00
f831bcfce2 Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p
By: md_5 <md_5@live.com.au>
2013-03-16 08:35:56 +11:00
8b867225be Automatically update upstream versions. Bukkit-1.4.7-R1.0-9-gf9917ef, CraftBukkit-1.4.7-R1.0-15-g8e7c097
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-15 14:31:33 -05:00
8fbce380ba Automatically update upstream versions. Bukkit-1.4.7-R1.0-8-g9b0ecdf, CraftBukkit-1.4.7-R1.0-14-gd3d98a1
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-15 13:41:40 -05:00
16eac56e06 Remove ANSI patch from @jrtc27 for now, breaks log strip colours.
By: md_5 <md_5@live.com.au>
2013-03-15 20:49:12 +11:00
3c598b3871 Strip colours from logs when enabled.
By: md_5 <md_5@live.com.au>
2013-03-15 20:46:16 +11:00
8e682dd68e Remove extra event debug. Doesn't help + issue is already identified
By: md_5 <md_5@live.com.au>
2013-03-15 07:20:41 +11:00
34ae30f823 Try harder to print debug.
By: md_5 <md_5@live.com.au>
2013-03-14 20:52:32 +11:00
4338e3bed9 Add debug code for event exceptions.
By: md_5 <md_5@live.com.au>
2013-03-14 20:37:44 +11:00
63ba9e08e4 Fix stripping colours in console logs.
By: md_5 <md_5@live.com.au>
2013-03-14 19:15:38 +11:00
39f0cb433f Rename ambiguous methods.
By: md_5 <md_5@live.com.au>
2013-03-14 16:32:15 +11:00
d21bdd7de7 Reapply Container.java CraftBukkit patches, but with 1.5 logic. This fixes crafting and other issues.
By: md_5 <md_5@live.com.au>
2013-03-14 16:25:03 +11:00
371c0e343c Restart even if restart script is not found
By: Runemoro <runemoro@live.ca>
2013-03-13 18:28:49 +11:00
2eac2bcaab Automatically update upstream versions. Bukkit-1.4.7-R1.0-7-g6ea9162, CraftBukkit-1.4.7-R1.0-13-g437c575
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-12 03:16:05 -05:00
8c7c0995db Undo all that encryption faff - NioBuffers arent for the job.
By: md_5 <md_5@live.com.au>
2013-03-12 17:26:16 +11:00
7a4245e726 Another shot at encryption - thanks to all those testers, getting this right is important for BungeeCord!
By: md_5 <md_5@live.com.au>
2013-03-12 07:29:16 +11:00
62ef7139b5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-6-gbcedb6b, CraftBukkit-1.4.7-R1.0-13-g437c575
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-11 05:06:05 -05:00
0947af2b10 Take #12312 at faster encryption - a brave soul who doesnt mind a minute or 2 of downtime should try
By: md_5 <md_5@live.com.au>
2013-03-11 20:30:38 +11:00
70186151ea Fix patch name.
By: md_5 <md_5@live.com.au>
2013-03-11 20:08:41 +11:00
50660d1b41 Update snapshot version.
By: md_5 <md_5@live.com.au>
2013-03-11 19:14:10 +11:00
68f9541e46 Revert "Use blazingly fast encryption."
This reverts commit 3309234e39.

By: md_5 <md_5@live.com.au>
2013-03-11 18:45:25 +11:00
3309234e39 Use blazingly fast encryption.
By: md_5 <md_5@live.com.au>
2013-03-11 09:53:34 +11:00
02150db731 Thread safety.
Adds thread safety for chunk load / unload methods.

By: md_5 <md_5@live.com.au>
2013-03-07 20:12:53 +11:00
89f57511ac Rename generated repo, and only deploy API, not server.
By: md_5 <md_5@live.com.au>
2013-03-07 17:45:12 +11:00
e514a12e83 Quick fix damage event
By: md-5 <md_5@live.com.au>
2013-03-05 07:22:03 +11:00
cbbd6b577d 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.
By: md_5 <md_5@live.com.au>
2013-03-04 18:49:59 +11:00
ce69ac9dbe Fix errors in command block commands crashing the server.
By: md_5 <md_5@live.com.au>
2013-03-03 20:23:04 +11:00
35e8706397 CB has now merged the commits we pulled, so they can be removed.
By: md_5 <md_5@live.com.au>
2013-03-03 09:37:31 +11:00
7b105cefda Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-13-g437c575
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-02 16:36:53 -06:00
ae6874b283 Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-12-g0ebed52
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-02 16:27:01 -06:00
f52ed81d18 Automatically update upstream versions. Bukkit-1.4.7-R1.0-4-gaa7469c, CraftBukkit-1.4.7-R1.0-10-g1ba48e7
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-02 00:36:58 -06:00
0f2cfe0303 Fix snapshot support.
By: md_5 <md_5@live.com.au>
2013-03-02 17:27:44 +11:00
4013812866 Add configurable 13w09c protocol support.
By: md_5 <md_5@live.com.au>
2013-03-02 13:34:52 +11:00
23ef44c195 Rename connection timing to accurately reflect what is actually being timed.
By: md_5 <md_5@live.com.au>
2013-03-02 10:40:13 +11:00
533f36d39b Pull CraftBukkit #1007 from @jrtc27 - console formatting now replicates Minecraft properly.
By: md_5 <md_5@live.com.au>
2013-03-02 10:07:29 +11:00