Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity
884 Commits 48 Branches 13 Tags 227 MiB
027e514ebf
Commit Graph

673 Commits

Author SHA1 Message Date
BlackHole
6d4063f6ef Add event for fire arrows igniting TNT - pulls Bukkit/CraftBukkit#1203 2013-09-16 10:54:11 +10:00
Dylan Xaldin
3ab9109cdb Nerf the Zombie Lag issues in MC 1.6 - Fixes MC-17630 2013-09-14 11:03:28 +10:00
md_5
414192b8ee Update Inventory and Health for PlayerConsumeItemEvent 2013-09-14 10:16:46 +10:00
md_5
e7ca6faddb Only update Attachable's when applyPhysics is true 2013-09-14 10:11:53 +10:00
Chad Waters
753cb006cc Update Physics When Updating Attachables 2013-09-13 14:19:31 +10:00
md_5
1b854cbe28 Upstream merge + remove 3 pulled patches. 2013-09-12 10:20:02 +10:00
erocs
f4367af8f5 Re add hopper checks 2013-09-09 14:40:16 +10:00
md_5
378fc7a71f Netty 4.0.9 is out 2013-09-08 08:45:06 +10:00
md_5
89720fa208 Upstream merge. 2013-09-08 08:42:56 +10:00
Nathan Adams
5c6d64a8b7 Prevent Duplicate Handshakes 2013-09-03 11:17:26 +10:00
Ammar Askar
8875760d7f Remove Pool Login Verifier Threads patch 2013-09-02 15:41:33 +02:00
md_5
5026435e9a Manually set nodelay so we can ignore errors 2013-09-01 18:23:51 +10:00
md_5
f99330b2ae Revert "Fix issue with chunk caching patch" 
This reverts commit 93d4dc070a.
 2013-08-27 19:22:44 +10:00
md_5
cfc141d731 Subsequently remove hopper check option 2013-08-25 12:25:40 +10:00
md_5
102438e3e7 Revert unjustified changes to hopper behaviour. 2013-08-25 12:22:37 +10:00
md_5
faa23b94b0 Pool Login Verifier Threads 
dem threads are expensive to make
 2013-08-23 17:41:15 +10:00
md_5
167757be21 Ensure main thread stack is dumped 2013-08-09 20:34:05 +10:00
md_5
e36ba8dd96 Upstream merge 2013-08-07 17:16:57 +10:00
md_5
cdd3c2f4e5 Oops, fix min speed patch 2013-08-07 07:19:06 +10:00
md_5
8b99287132 Cap min speed not velocity 2013-08-06 11:19:10 +10:00
md_5
5545a5473c Cap Minimum Velcoity to 0.001. The client flips out at smaller values 2013-08-05 20:18:22 +10:00
Phillip Schichtel
b0888e8231 Update console command completion for improved thread safety 2013-08-04 20:01:08 +10:00
md_5
843c21ddf8 Upstream Merge 2013-08-04 08:51:09 +10:00
Ammar Askar
70a75c0b48 Guard entity list during ticking 2013-08-03 22:04:58 +05:00
Ammar Askar
93d4dc070a Fix issue with chunk caching patch 2013-08-03 20:34:40 +05:00
Ammar Askar
69cbbd9844 Update entity count code with World.a(Class)'s new stuff 2013-08-03 20:24:33 +05:00
md_5
7db0f5eda8 Get rid of ambiguity 2013-08-03 20:01:12 +10:00
DerFlash
edd0d42995 Add Getter for Entity Invulnerability 2013-08-03 19:54:36 +10:00
md_5
5c9d00bad4 Add task class to timings for more in depth info 2013-08-03 19:39:35 +10:00
md_5
eb882d6111 Pop latest 2 patches to top 2013-08-03 19:35:01 +10:00
agentk20
8e1879bfb5 Fully disable snooper when not required 2013-08-03 19:29:28 +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
f9c6a78ef4 Dump main server thread first for easier reading of the watchdog dumps and to reduce people unable to read and spamming our forums 2013-08-03 19:15:22 +10:00
md_5
401e57955a Add more async safeguards 2013-08-03 19:09:09 +10:00
md_5
de06085d4f Plug world unload memory leak. Thanks @riking for identifying the issue. 2013-08-03 19:03:14 +10:00
md_5
29b89513c5 Please don't use "null" as a spam exclusion. Guard against it anway. 2013-08-03 19:01:50 +10:00
md_5
31e1e0e950 Add outdated client / server messages to config 2013-08-03 18:59:36 +10:00
md_5
381a40a50a Upstream merge 2013-08-03 18:45:50 +10:00
md_5
5462e4c2bb Upstream merge 2013-07-30 07:27:59 +10:00
md_5
2fff7d15c5 Sigh. Back to good old fashioned whatever we had before. Can anyone recommend some xray client I can actually use to test this stuff? 2013-07-28 21:47:45 +10:00
md_5
cb44b83822 Damn I hate mode #2 2013-07-28 20:29:49 +10:00
md_5
a8269a5119 Fix engine mode 2, again 2013-07-28 15:58:10 +10:00
md_5
e5b7d37953 Fix engine mode 2 2013-07-28 08:23:08 +10:00
md_5
7e99854246 1,3 can only be expressed as an integer, not a byte! #logic 2013-07-27 11:56:56 +10:00
md_5
e6c808d887 Add new replacements config for use with anti xray mode 2 2013-07-27 11:48:43 +10:00
md_5
ea574d0315 Fix invalid username patch to disconnect correctly 2013-07-25 17:06:35 +10:00
md_5
5d31ee288a Should probably do an upstream update. 2013-07-24 19:33:10 +10:00
md_5
32eb618d1c Bump netty versions ._. 2013-07-24 17:43:12 +10:00
md_5
6139802e21 Update to Netty 4.0.3 final! 2013-07-19 19:45:54 +10:00
md_5
3e1ce88947 Update to latest CB 2013-07-19 19:35:05 +10:00
Ammar Askar
83732d4ce1 Simplify contains in LongHashSet along with some other minor tweaks 2013-07-19 13:16:32 +05:00
Ammar Askar
b1fafd6a88 Added simple entity ticking caching 2013-07-16 16:24:37 +05:00
md_5
a144cc905b [Anti XRay] Don't trigger updates on the clicked block - fixes block lag caused when mining ores quickly. 2013-07-15 14:14:45 +10:00
md_5
e881f8990f Reset default antixray blocks to remove 1 and 5, to fix block lag people have being seeing. Thanks @andrewkm for the report. 2013-07-13 11:37:21 +10:00
md_5
3005aa33e0 Add additional case for EntityDismountEvent 2013-07-11 16:59:26 +10:00
md_5
c7c08d81ae Remove CraftHorse patch since it is now covered by upstream 2013-07-11 11:33:09 +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
MonsieurApple
ed79b37aaa Fix potion effects not being reset on death. Fixes 
BUKKIT-4515
 2013-07-11 10:28:04 +10:00
md_5
bc88549f20 Fix client crash with cannot send chat message 2013-07-10 23:46:31 +10:00
ItsHarry
d69d231845 Fixed StructureGrowEvent.getPlayer(); always returning null regardless of whether bone meal was used or not. 2013-07-10 13:48:26 +02:00
md_5
6b3632e736 Remove patch that prevents piston extend event firing twice - causes pistons to eat blocks on some occasions. Thanks Salaman and his team for debugging. 2013-07-09 13:16:16 +10:00
md_5
5a70ec4f37 PendingConnection.c() -> d() 2013-07-09 10:48:33 +10:00
md_5
9018b1d7ba Update Spigot to Minecraft 1.6.2 2013-07-09 10:31:10 +10:00
md_5
3ec60528a2 Update Packet44 to take a snapshot of attributes to prevent concurrent modification leading to bad packets or CMEs. This is a REQURIED update to get support. 2013-07-09 08:29:39 +10:00
md_5
d06a613c2f Change jar name to include 1.6.2 2013-07-08 21:38:44 +10:00
md_5
34c6423083 Minor code cleanup to snapshot protocol - nothing functional 2013-07-08 21:27:56 +10:00
md_5
14d833f8e2 Add missing packet 2013-07-08 21:19:55 +10:00
md_5
b0cbbf81cc 1.6.2 Protocol Support Enabled by Default 2013-07-08 21:17:32 +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
0bab96762d Always call dismount events regardless of Vehicle or not 2013-07-08 09:22:29 +10:00
md_5
8674b1053d Keep CraftServer init early, but make plugins load at approx the same time they do in CraftBukkit - thanks @aadnk for wanting this 2013-07-07 09:33:34 +10:00
md_5
df2ee3e398 Replace MessageList with list, see if we can catch issues. 2013-07-07 09:05:04 +10:00
md_5
a59da621da Ensure packet hooks are called sync - thanks @aadnk for pointing this out 2013-07-07 09:02:13 +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
87854c51ab Add my "fix" for EntityPersistance, I do believe that removing this check is incorrect and the result of a slight hiccup by Bukkit. 2013-07-05 21:56:07 +10:00
md_5
124d4867c7 Add Type Safety checks for............. sanity....? 2013-07-05 13:19:45 +10:00
md_5
3601ca3da5 Pull a series of CraftBukkit patches - see below for summary and credits: 
Bukkit/CraftBukkit#1145 : @Zarius : Don't fire piston extend event twice
Bukkit/CraftBukkit#1174 : @millerkil : Prevent plugins causing ghost players
Bukkit/CraftBukkit#1177 : @jb-aero : Properly set ambient flag for potion effects
 2013-07-05 12:22:04 +10:00
Alex Ciuba
693b2872b1 Properly Consume Bonemeal in Dispensers 
Don't consume bonemeal if there is no crop in front. Fixes BUKKIT-3790
Pulls Bukkit/CraftBukkit#1172
 2013-07-05 12:22:01 +10:00
Mike Primm
a7014a3eb7 Create CraftHorse Instance for EntityHorse 
Handle creating instance of CraftHorse for EntityHorse instances and spawn()
Pulls Bukkit/CraftBukkit#1185
 2013-07-05 12:22:01 +10:00
md_5
81aee9fec2 Prevent crash on dismount, thanks Salaman for the report! 2013-07-05 12:21:49 +10:00
md_5
bc16626761 Include only the bits of netty we need 2013-07-04 20:14:10 +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
6cca81703a Netty CR9 2013-07-04 19:58:09 +10:00
md_5
fec1763e6d Switch index length check around to prevent crashes 2013-07-04 12:11:17 +10:00
md_5
1fbd057e42 Wouldn't it be nice if the console was coloured - actually colour console messages instead of just leaving colour codes. 2013-07-04 10:12:57 +10:00
md_5
3c872410f5 Update again - git isn't as smart as he looks 2013-07-03 14:16:28 +10:00
md_5
63116b317c Update to latest upstream 2013-07-03 14:05:15 +10:00
md_5
d8a5e9ddfd Close Horse Inventory on Disconnect 2013-07-03 08:35:21 +10:00
Benjamin James Harrison-Sims
3590fce0d3 Close horse inventory on logoff to prevent dupe 2013-07-03 08:31:43 +10:00
md_5
54195222b9 Update to latest CraftBukkit - is this more patches without credit I see? 2013-07-03 08:27:18 +10: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
f76f65a837 [CraftBukkit] Use correct variable when migrating world so as not to screw up rcon and getServerIP 2013-07-02 20:11:09 +10:00
md_5
fe4ec4e7ad Prevent buffer from being freed prematurely or twice. 2013-07-02 17:31:00 +10:00
md_5
6e333e5df4 Netty errors? What errors? I see no errors..... 2013-07-02 15:33:58 +10:00
md_5
2da1a22e64 Update to netty CR8 2013-07-02 15:31:49 +10:00
md_5
94d29288b5 Fix 1.5 pinging the server - its a bit hacky, but it works! 2013-07-02 15:27:31 +10:00
md_5
f1226f6e13 Fix /reload not functioning - thanks AlexM850 for the report. 2013-07-02 15:14:02 +10:00
md_5
b94f2b8159 Clean nibble arrays patch Packet51 to fix crash bug mentioned by Drumming102 on IRC. 2013-07-02 15:12:49 +10:00
md_5
79d9e36303 Return of the Netty... dun dun dun 2013-07-02 15:06:15 +10:00
md_5
0f94ebdabe Disable netty always - it will be fixed ASAP 2013-07-02 14:30:13 +10:00
md_5
990b604a30 Fix CraftBukkit bug - Actually Use Results of PingEvent 2013-07-02 14:29:18 +10:00
md_5
0c1676e3d4 Update Spigot to 1.6.1 and disable Netty. Be sure to keep backups, we will not be held responsible for your loss! 2013-07-02 13:57:42 +10:00
md_5
667f4b4655 Spigot 1.6.1 - Those who are aware of the risks will figure out how to compile, testing is underway. 2013-07-02 13:45:51 +10:00
md_5
658ae8b3fa Remove skeleton bow shoot patch - needs to be updated 2013-07-02 13:41:40 +10:00
md_5
8752e9f61f Update netty and watchdog 2013-07-02 13:36:58 +10:00
md_5
40a2f5b7ad Finish entity actviation range 2013-07-02 13:34:16 +10:00
md_5
ed6ba2a745 Fix mob spawn patch 2013-07-02 13:24:59 +10:00
md_5
744cbbd49f Fix nibble array patch - we will need to stage Packet51 in the near future 2013-07-02 13:23:38 +10:00
md_5
11056f21c8 Remove patch #15 - optimized chunk unload 2013-07-02 13:21:57 +10:00
md_5
6c93b3cc48 Update particle api mc-dev staged things 2013-07-02 13:17:13 +10:00
md_5
4d2619f099 Remove LocalLanguage patch for now 2013-07-02 13:14:40 +10:00
md_5
5d790af909 Update to Minecraft 1.6.1 - Phase 1 2013-07-02 13:03:56 +10:00
md_5
d3f473de73 Split chunk compression to its own patch. 2013-07-02 09:08:07 +10:00
md_5
ad45efc6ce Remove multiplexing server connection as we do not need it with 1.6 2013-07-02 09:05:40 +10:00
md_5
64a3e2baa5 Use startsWith for spam exclusions 2013-07-01 14:35:48 +10:00
md_5
fff3a4f3f9 No stack traces please 2013-06-30 08:38:54 +10:00
md_5
184ccfa363 Remove slow and complex pipelining and make our own packet writing system. Speed glorious speed. 2013-06-29 17:39:07 +10:00
md_5
b5047135c3 Even nicer throttling + encoding. 2013-06-29 16:27:52 +10:00
md_5
2332de0fda Hey ma, look at my packet encoder! 2013-06-29 16:07:41 +10:00
md_5
d2bde0b68f Update to Netty CR7 - boasts numerous bug fixes and improvements, is sex 2013-06-29 15:36:18 +10:00
md_5
df32b00c1e Simplify close inventory patch 2013-06-29 13:46:41 +10:00
md_5
0bb0ba794f Disallow Interaction With Self 2013-06-28 19:53:05 +10:00
md_5
4bf5a2ead4 Move close inventories patch up 2013-06-28 14:17:59 +10:00
md_5
a40b3f90c7 Properly Close Inventories 
Properly close inventories when unloading and switching worlds.
 2013-06-27 17:26:20 +10:00
md_5
a87b0db033 Fix potential errors when plugins log with a null message 2013-06-26 16:59:37 +10:00
md_5
26ed947128 Java 1.6 compile support 2013-06-25 18:12:27 +10:00
md_5
8c974b4f67 Always fire PreLoginEvent 2013-06-25 18:09:55 +10:00
md_5
fa4b1f668f Throw exceptions when we can't bind 2013-06-24 12:24:38 +10:00
md_5
1aa048c61e Use our throttle method, diff needs a little bit of work. May be buggy, use with care. 2013-06-24 07:42:20 +10:00
md_5
7b558570ea Flip netty/non netty so correct setting is used, still looking into throttle 2013-06-24 07:35:42 +10:00
md_5
33a79925d8 Comment out unused per-listener throttle 2013-06-23 16:45:43 +10:00
md_5
bdf7193be3 Don't print bind notice twice; throw exception when unable to bind 2013-06-23 16:33:18 +10:00
md_5
7d3f731504 Pull Bukkit/CraftBukkit#1130 - Include result slot in CraftInventoryAnvil.getItem .Fixes BUKKIT-2788 2013-06-23 13:58:40 +10:00
md_5
777dddbc24 Customize server is full message 2013-06-23 11:06:30 +10:00
md_5
c6e50618a8 Add log filtering! 2013-06-23 10:38:51 +10:00
md_5
427d6df4cb I found you, Mr Disable Random Light Updates! 2013-06-22 16:12:17 +10:00
md_5
c4163f30c6 Fix Bungee support 2013-06-22 15:48:42 +10:00
md_5
66a7394806 Add netty-threads option 2013-06-22 14:35:20 +10:00
md_5
6ec312912d Cactus Cactus Cactus Cactus Cactus 2013-06-22 14:16:11 +10:00
md_5
5b3bd96325 Properly re-register commands on reload 2013-06-22 14:07:01 +10:00
md_5
a79c1fc577 Integer cannot be cast to Short :( 2013-06-22 13:59:56 +10:00
md_5
a18171d81c Add a patch to allow configuring and editing some server messages. 2013-06-21 19:22:15 +10:00
md_5
9c2abd8b65 The server loads all settings correctly as far as I can tell. This marks the end of stage 2. Stage 3 (testing of all features and commands) will start tomorrow. 2013-06-21 19:17:26 +10:00
md_5
f6514125a3 Load from correct class 2013-06-21 19:10:58 +10:00
md_5
0962624397 Progress on actually getting stuff to load. 2013-06-21 19:08:32 +10:00
md_5
1e51504654 More static please 2013-06-21 18:57:20 +10:00
md_5
2b3dc8d5a8 *wipes sweat off brow, add /tps and /restart commands 2013-06-21 18:25:45 +10:00
md_5
257cc9648d Add ability to register commands 2013-06-21 18:21:29 +10:00
md_5
1d3a0f7488 Reload support for spigot.yml 2013-06-21 18:14:27 +10:00
md_5
619e564093 Add our tab complete patch back 2013-06-21 18:06:04 +10:00
md_5
3fbe058033 Add our command logging disable patch 2013-06-21 18:01:41 +10:00
md_5
3abc02a4c8 Add our spam filter exclusions patch 2013-06-21 17:59:37 +10:00
md_5
382b024888 Add our enable foreign language in signs patch 2013-06-21 17:53:18 +10:00
md_5
20051065ad Rename next tick list performance patch 2013-06-21 17:50:04 +10:00
md_5
4bda2412ce Rename translation caching patch 2013-06-21 17:47:12 +10:00
md_5
eed7b85ce6 Rename close unloaded save files 2013-06-21 17:46:00 +10:00
md_5
3b7adf24b7 Rename invalid name filter patch 2013-06-21 17:45:10 +10:00
md_5
61dd3c6834 Experimentally remove another patch 2013-06-21 17:42:59 +10:00
md_5
e94f09ff80 Ping sending patch done 2013-06-21 17:41:26 +10:00
md_5
8a883922a8 Merge the two spawn calculation fixes 2013-06-21 17:35:08 +10:00
md_5
20e0c70bd8 More patches 2013-06-21 17:30:13 +10:00
md_5
dce45d252c Redo longhash tweaks 2013-06-21 17:14:11 +10:00
md_5
8cbfcf995d Compiling up to patch 10 2013-06-21 17:00:01 +10:00
md_5
d98522c69d Remove some CraftBukkit pull requests that don't have any functional benefit at the moment. 2013-06-21 16:49:33 +10:00
md_5
c3faaa3d24 Rename Spigot changes patch to growth rates and simplify its contents 2013-06-21 16:47:56 +10:00
md_5
8def048446 Round 1 of Spigot.yml / Spigot Rewrite / Spigot Cleanup is complete! 2013-06-20 19:44:06 +10:00
md_5
4e5ba04a5b Bungee 2013-06-20 19:37:15 +10:00
md_5
715a18a7d9 Netty 2013-06-20 19:23:30 +10:00
md_5
0503dd73fd Metrics and watchdog 2013-06-20 19:07:32 +10:00
md_5
1176626e5e Activation Range 2013-06-20 19:00:26 +10:00
md_5
9d2daf140b Orebfuscator 2013-06-20 18:52:23 +10:00
md_5
9c9a514b77 Merge tweaks 2013-06-20 18:41:59 +10:00
md_5
df45aed819 Rough Spigot Changes 2013-06-20 18:21:31 +10:00
md_5
ba7c6ef6b0 Add more to the config 2013-06-20 18:16:28 +10:00
md_5
ccd447743e Show off some WIP patches. 2013-06-20 17:52:17 +10:00
md_5
919070df83 Simplify 2013-06-20 17:36:06 +10:00
md_5
07b12237b5 Implement yaml load / save methods. 2013-06-20 17:31:40 +10:00
md_5
a36e58024a Reduce packet antispammer as low as we can go. 2013-06-18 18:15:35 +10:00
Robin Lambertz
aa0f27bcd9 Fix Particle API. Fix an NPE occuring if effect.getData is null, and fix the constructor of the Packet63 not using the right arguments. 2013-06-18 12:12:43 +10:00
md_5
6944fc62b9 Downgrade network engine to fix reliability issues 2013-06-17 07:29:49 +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
TomyLobo
a59cfc6379 Fix compilation on Sun JDK (and any other strictly conforming compiler) 
http://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.12.1
http://ideone.com/MGCWja
 2013-06-16 10:18:09 +10:00
md_5
8f3f548e7d Do Not Search for Offline Players 
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
 2013-06-16 08:21:11 +10:00
md_5
2747aa6e49 Fix loading of per world settings 2013-06-15 22:01:15 +10:00
md_5
f126583c52 Add meta crash fix 2013-06-15 21:35:04 +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
8447f3ec63 Bracket hell, thanks @sleaker. 2013-06-13 15:56:15 +10:00
md_5
8ecb4f1961 Rename some patches to be more concise. More to come once we can think of better names :p 2013-06-11 14:11:48 +10:00
md_5
016520a89f Remove redundant patch 2013-06-11 14:06:05 +10:00
md_5
14a70d4c94 Split out offline player lookups 2013-06-11 14:02:19 +10:00
md_5
45414bbf61 Finish refactoring configuration. The PAIN is over for now 2013-06-11 13:25:58 +10:00
md_5
c4a67b640b Let the PAIN begin 2013-06-11 12:56:24 +10:00
md_5
d7b0d9b514 Split out getCubes patch 2013-06-11 12:18:55 +10:00
md_5
43f3c03491 Slightly prettier patch file 2013-06-11 12:13:28 +10:00
md_5
2fee804892 Split out the better save queue patch 2013-06-11 12:10:31 +10:00
md_5
2d52b62169 Split shutdown hang fix into own patch 2013-06-11 11:54:45 +10:00
md_5
40287791c8 Incorrect brackets.... 2013-06-10 14:10:42 +10:00
md_5
1fd79fc87e Null checks for the sake of nullchecks 2013-06-10 11:38:51 +10:00
md_5
e0ad90304f Fix missing nullcheck in particle API 2013-06-10 10:58:26 +10:00