Commit Graph
100 Commits
Author SHA1 Message Date
Spigot 2b4768e91c Automatically update upstream versions. Bukkit-1.4.7-R1.0-32-gf62fbdb, CraftBukkit-1.4.7-R1.0-57-g7e17c4e
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 17:01:37 -05:00
Spigot b7451e3081 Automatically update upstream versions. Bukkit-1.4.7-R1.0-32-gf62fbdb, CraftBukkit-1.4.7-R1.0-56-gfbfbc31
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 14:31:44 -05:00
Spigot 815bf98bca Automatically update upstream versions. Bukkit-1.4.7-R1.0-31-g62cc82a, CraftBukkit-1.4.7-R1.0-55-g84a45ed
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 13:56:52 -05:00
Spigot 72dc4ac12e Stage DataWatcher & WatchableObject.
So that we may identify the exact cause of exceptions originating from these classes.

By: md_5 <md_5@live.com.au>
2013-03-21 17:01:03 +11:00
Spigot 0e364e9549 Automatically update upstream versions. Bukkit-1.4.7-R1.0-30-ge416362, CraftBukkit-1.4.7-R1.0-54-gff7c371
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-21 00:26:42 -05:00
Spigot ad59157c8d Automatically update upstream versions. Bukkit-1.4.7-R1.0-30-ge416362, CraftBukkit-1.4.7-R1.0-53-g2305e00
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 18:11:41 -05:00
Spigot c4165ee243 Merge pull request #24 from TehRainbowGuy/master
Updates spigot to 1.5.1
By: md-5 <md_5@live.com.au>
2013-03-20 15:53:34 -07:00
Spigot 18b5768f30 Automatically update upstream versions. Bukkit-1.4.7-R1.0-29-gd5caa86, CraftBukkit-1.4.7-R1.0-52-gea9f433
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 17:51:41 -05:00
Spigot f370ab8784 Update to 1.5.1
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
2013-03-20 21:54:12 +00:00
Spigot 9a3a09e79b Automatically update upstream versions. Bukkit-1.4.7-R1.0-28-g3d44b71, CraftBukkit-1.4.7-R1.0-51-ge66afce
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 16:31:44 -05:00
Spigot d0aecbe5b8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-50-gd94f0e2
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 11:16:44 -05:00
Spigot d192d9c166 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-49-g0950755
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 10:36:38 -05:00
Spigot 3801a14410 Automatically update upstream versions. Bukkit-1.4.7-R1.0-27-gca7687d, CraftBukkit-1.4.7-R1.0-48-gdd11b36
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-20 09:46:53 -05:00
Spigot 25406815cd Update Bukkit version.
By: md_5 <md_5@live.com.au>
2013-03-20 16:52:18 +11:00
Spigot 48496790c8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-25-gad0ccae, CraftBukkit-1.4.7-R1.0-46-gaaa580b
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-19 21:57:28 -05:00
Spigot bad273fe08 Update le patches so that they may henceforth apply cleanly without errors due to the last upstream commit.
By: md_5 <md_5@live.com.au>
2013-03-19 16:51:45 +11:00
Spigot 96d7ce81a7 Automatically update upstream versions. Bukkit-1.4.7-R1.0-24-gf213536, CraftBukkit-1.4.7-R1.0-45-g5c7d0bb
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-19 00:47:21 -05:00
Spigot f2403de900 Automatically update upstream versions. Bukkit-1.4.7-R1.0-24-gf213536, CraftBukkit-1.4.7-R1.0-44-g82d40a0
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:52:23 -05:00
Spigot 79b9627fc8 Automatically update upstream versions. Bukkit-1.4.7-R1.0-21-g5ce29c1, CraftBukkit-1.4.7-R1.0-43-gc9172a4
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:27:23 -05:00
Spigot 6f3f25f827 Automatically update upstream versions. Bukkit-1.4.7-R1.0-21-g5ce29c1, CraftBukkit-1.4.7-R1.0-42-g7b3cf23
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 21:22:26 -05:00
Spigot 95677bfd79 Automatically update upstream versions. Bukkit-1.4.7-R1.0-20-g8846f9e, CraftBukkit-1.4.7-R1.0-41-g5ebee02
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 18:27:23 -05:00
Spigot a1483db9ca Automatically update upstream versions. Bukkit-1.4.7-R1.0-20-g8846f9e, CraftBukkit-1.4.7-R1.0-40-gd3cf25a
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 17:22:33 -05:00
Spigot 9e37fb091b Automatically update upstream versions. Bukkit-1.4.7-R1.0-19-g4a23f3f, CraftBukkit-1.4.7-R1.0-39-gd7fe50c
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 14:02:27 -05:00
Spigot 105f20085a Implement Travis
By: Zach Bruggeman <zbruggeman@me.com>
2013-03-17 12:04:04 -07:00
Spigot 3fc59cc0ee Automatically update upstream versions. Bukkit-1.4.7-R1.0-19-g4a23f3f, CraftBukkit-1.4.7-R1.0-38-ga73b6e1
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-18 13:17:36 -05:00
Spigot 082176c726 We should return "" not null for 'corrupt' signs.
By: md_5 <md_5@live.com.au>
2013-03-18 20:33:22 +11:00
Spigot 5ade077442 Prevent NPE in CraftSign
This commit prevents the constructor of CraftSign throwing an NPE when it cannot get the sign tile entity. Instead it will fallback to a 4 empty lined sign, and not try to do anything to those lines on .update().

@TheDgtl

By: md_5 <md_5@live.com.au>
2013-03-18 20:02:03 +11:00
Spigot 4baf879929 Automatically update upstream versions. Bukkit-1.4.7-R1.0-15-g51798af, CraftBukkit-1.4.7-R1.0-34-g484df2d
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 22:31:36 -05:00
Spigot 7ba25d1232 Automatically update upstream versions. Bukkit-1.4.7-R1.0-13-g51da39d, CraftBukkit-1.4.7-R1.0-33-g246aa19
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 20:21:36 -05:00
Spigot 57e4979e31 Automatically update upstream versions. Bukkit-1.4.7-R1.0-13-g51da39d, CraftBukkit-1.4.7-R1.0-32-gd7c4f89
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-17 13:06:47 -05:00
Spigot cc6e8ab703 Faster UUID for entities
It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.

By: md_5 <md_5@live.com.au>
2013-03-17 19:02:58 +11:00
Spigot f4da5482df Deploy server again. wot eva
By: md_5 <md_5@live.com.au>
2013-03-17 12:27:11 +11:00
Spigot 3a7173aa1b Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-31-g4ff57b2
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 18:36:31 -05:00
Spigot 62e902bbcc Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-30-g55b5fb7
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 18:21:29 -05:00
Spigot 81d0524331 Automatically update upstream versions. Bukkit-1.4.7-R1.0-11-g78bf7a9, CraftBukkit-1.4.7-R1.0-29-ge46c007
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:31:32 -05:00
Spigot fee63691d5 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-29-ge46c007
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:16:32 -05:00
Spigot d9002e97ca Update Netty to 4.0.0-Beta3 + reapply patches for new index info.
By: md_5 <md_5@live.com.au>
2013-03-17 09:14:16 +11:00
Spigot 36dd1f54b3 Automatically update upstream versions. Bukkit-1.4.7-R1.0-10-g3645b38, CraftBukkit-1.4.7-R1.0-28-g35194cb
By: EcoCityCraft <admin@ecocitycraft.com>
2013-03-16 17:01:30 -05:00
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 1218987001 Fix isDamaged check for backwards compat
By: md_5 <md_5@live.com.au>
2013-03-16 11:57:39 +11:00
Spigot 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
Spigot 78b59cb9ef Cleanup patch
By: md_5 <md_5@live.com.au>
2013-03-16 10:11:01 +11:00
Spigot 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
Spigot 12afb9956e Update Spigot API patches for 1.5
By: md_5 <md_5@live.com.au>
2013-03-16 08:39:54 +11:00
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 3c598b3871 Strip colours from logs when enabled.
By: md_5 <md_5@live.com.au>
2013-03-15 20:46:16 +11:00
Spigot 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
Spigot 34ae30f823 Try harder to print debug.
By: md_5 <md_5@live.com.au>
2013-03-14 20:52:32 +11:00
Spigot 4338e3bed9 Add debug code for event exceptions.
By: md_5 <md_5@live.com.au>
2013-03-14 20:37:44 +11:00
Spigot 63ba9e08e4 Fix stripping colours in console logs.
By: md_5 <md_5@live.com.au>
2013-03-14 19:15:38 +11:00
Spigot 39f0cb433f Rename ambiguous methods.
By: md_5 <md_5@live.com.au>
2013-03-14 16:32:15 +11:00
Spigot 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
Spigot 371c0e343c Restart even if restart script is not found
By: Runemoro <runemoro@live.ca>
2013-03-13 18:28:49 +11:00
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 70186151ea Fix patch name.
By: md_5 <md_5@live.com.au>
2013-03-11 20:08:41 +11:00
Spigot 50660d1b41 Update snapshot version.
By: md_5 <md_5@live.com.au>
2013-03-11 19:14:10 +11:00
Spigot 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
Spigot 3309234e39 Use blazingly fast encryption.
By: md_5 <md_5@live.com.au>
2013-03-11 09:53:34 +11:00
Spigot 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
Spigot 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
Spigot e514a12e83 Quick fix damage event
By: md-5 <md_5@live.com.au>
2013-03-05 07:22:03 +11:00
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 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
Spigot 0f2cfe0303 Fix snapshot support.
By: md_5 <md_5@live.com.au>
2013-03-02 17:27:44 +11:00
Spigot 4013812866 Add configurable 13w09c protocol support.
By: md_5 <md_5@live.com.au>
2013-03-02 13:34:52 +11:00
Spigot 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
Spigot 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
Spigot 00c98bb061 Pull CraftBukkit #1043 by @YLivay - addresses incorrect info returned to plugins in the dispense event.
By: md_5 <md_5@live.com.au>
2013-03-02 09:47:17 +11:00
Spigot 4812d94ad9 Pull CraftBukkit #1042 by @YLivay - addresses players glitching when the sleep whilst being marked as faux sleepers.
By: md_5 <md_5@live.com.au>
2013-03-02 09:43:59 +11:00
Spigot abb5a8c429 Pull CraftBukkit #1041 by @YLivay - address missing event for paintings breaking due to movement.
By: md_5 <md_5@live.com.au>
2013-03-02 09:38:27 +11:00
Spigot 93b6957b56 Pull CraftBukkit PR #1037 by @EdGruberman - fixes issues with plugins and items dropped by clicking outside an inventory.
By: md_5 <md_5@live.com.au>
2013-03-02 09:25:48 +11:00
Spigot 166d4a8990 Pull CraftBukkit #1028 by @EdGruberman to address a few issues with plugins and beds.
By: md_5 <md_5@live.com.au>
2013-03-02 09:17:52 +11:00
Spigot c7f16ebbea When I add code to prevent server crashes, I expect it to stay there.
By: md_5 <md_5@live.com.au>
2013-03-02 09:09:10 +11:00
Spigot 6d3ec813ed Pull CraftBukkit #1024 by @evilmidget38 - Correct the CB object used for Brewing Stands. Fixes BUKKIT-3357
By: md_5 <md_5@live.com.au>
2013-03-02 09:05:30 +11:00
Spigot dbd65c5168 Merge pull request #20 from aikar/master
Sanity check for naughty plugins
By: md-5 <md_5@live.com.au>
2013-02-27 11:19:21 -08:00
Spigot 5bf4cae8ba Sanity check for naughty plugins
Naughty plugins like DisguiseCraft hook into NMS and create entities with a null world.
So ensuring world is set or else defaulting to false

By: Aikar <aikar@aikar.co>
2013-02-27 10:10:07 -05:00
Spigot dfe217aca6 Optimize checkIfActive to only check if chunks are loaded if entity is active
This will cut down on the call to areChunksLoaded drastically, which is pretty slow

By: Aikar <aikar@aikar.co>
2013-02-27 02:27:14 -05:00
Spigot 2c8cc83ee8 *crosses fingers for sneaky web edit
By: md-5 <md_5@live.com.au>
2013-02-27 17:14:37 +11:00
Spigot 78edae0084 Bump netty version. Why they so no pull my PR yet?
By: md_5 <md_5@live.com.au>
2013-02-27 16:51:57 +11:00