flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,018 Commits 1 Branch 0 Tags 92 MiB
6e4122e551
Commit Graph

4542 Commits

Author SHA1 Message Date
worktycho
106e06617a Merge pull request #2224 from cuberite/ChunkQueueCollapsing 
Chunk queue collapsing: MK II
 2015-07-04 14:43:00 +01:00
Samuel Barney
ba0577bbd0 Moved grabbing the light value to after the transparency check. 2015-07-03 13:05:02 -06:00
Samuel Barney
0307b6aba0 Added missing parens 2015-07-02 16:19:23 -06:00
Samuel Barney
e248539d74 Grass now only dies if it has an opaque block above it. 
Grass only spreads to a dirt block if the light level is above 4 and the block above it is transparent.
 2015-07-02 16:16:05 -06:00
Samuel Barney
404cf5dcfd Farmland is now listed as an opaque block. 
Changed spread light falloff for farmland to what it was originally.
 2015-07-02 16:13:40 -06:00
Mattes D
66a164a9a7 Added neighbor specification in the OnNeighborChanged() block callback. 
Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields.
Fixes #2213.
 2015-07-01 10:40:16 +02:00
Mattes D
f6ab461383 BlockArea: Fixed a crash with areas higher than chunk height. 2015-06-30 14:08:21 +02:00
STRWarrior
e5cfe0cd96 Added a size check for portals. 
Made the portal size configurable

Alpha-sorted SetXYZNetherPortalXYZ functions
 2015-06-28 17:05:44 +02:00
tycho
257011b440 use atomic for state, to avoid torn reads 2015-06-27 12:10:24 +01:00
bibo38
bb46afcb7e Now Horses spawn with correct data values. 
The max-value of style is 4, of color is 6.
See http://wiki.vg/Entities#Horse
Also based on the if, the max value of HorseType is 7.
Bugfix #2259
 2015-06-26 19:32:16 +02:00
worktycho
0a7c54261f Merge pull request #2241 from lkolbly/master 
Work on NetherPortalScanner. Setup portal scanner to reset PortalCool…
 2015-06-26 14:12:29 +01:00
worktycho
7187c00342 Merge pull request #2282 from Haxi52/button-fixes 
Button fixes
 2015-06-25 15:46:33 +01:00
Mattes D
8e1437be08 Merge pull request #2290 from bibo38/mousefix 
Fixed Middle-Click Button in the ClickWindow-Packet.
 2015-06-25 16:11:56 +02:00
bibo38
31466fda5f Doors now get placed on the server-side. 
The Y-Value is already the lower door block(From ItemHandler.cpp:346).
Increasing it once again, places the door into the air, which is blocked by Cuberite.
Bugfix #2279
 2015-06-25 16:17:03 +02:00
bibo38
ec628846d2 Fixed Middle-Click Button in the ClickWindow-Packet. 
See http://wiki.vg/Protocol#Click_Window
The MiddleClick has the button 2 and not 0. Now you can max an item in an inventory in Creative mode, without inventory desync.
Bugfix #2260
 2015-06-25 13:01:48 +02:00
Hax52
9f1d1c058f Buttons no longer click on when already on. Buttons now play sound when clicking off. 2015-06-24 13:52:56 -05:00
Mattes D
c1780366b0 Merge pull request #2288 from cuberite/melonFix 
Call Neighbour changed handlers when a melon is created
 2015-06-24 14:59:47 +02:00
Mattes D
4f8e2f180d Added a forgotten break in cHangingEntity constructor. 
This had caused loading the cHangingEntity to fail in debug builds.
 2015-06-24 13:39:11 +02:00
tycho
b02b262a7c Call Neighbour changed handlers when a melon is created 
Should prevent cascading farmland updates on breaking melons
 2015-06-23 21:27:37 +01:00
worktycho
c0d8a4933e Merge pull request #2284 from cuberite/FixBiomeGen 
Generate biomes when pregenerating heights through CompositedHeiGen.
 2015-06-23 17:26:39 +01:00
Mattes D
2daa9c5854 Fixed melon metadata when growing from stem. 2015-06-23 17:23:35 +02:00
Mattes D
55a5f11b1b Fixed right-click with bonemeal. 
The client would send invalid right-click events with Y set to 0x7ff, which would crash the server. Only process bonemeal for valid clicks (valid blockface).
 2015-06-23 15:23:11 +02:00
Mattes D
6cd71a1e73 Generate biomes when pregenerating heights through CompositedHeiGen. 
Fixes #2283.
 2015-06-23 14:45:35 +02:00
Tiger Wang
33fc1474d9 Fixed minor errors in Tycho's code 
Everything should work now :)
 2015-06-22 21:27:13 +01:00
Samuel Barney
e70e2b8ecc Rebased version of Code 2015-06-22 11:29:38 -06:00
Mattes D
3889b2cac2 Refactored block placement workflow. 
Multi-blocks can now use the default OnPlayerPlaced() callback in cItemHandler.
 2015-06-21 19:49:22 +02:00
Mattes D
e06dd8f20e Added basic support for loading village prefabs from files. 2015-06-20 15:37:41 +02:00
worktycho
33d68572a6 Merge pull request #2255 from cuberite/LoadablePieces 
Loadable pieces
 2015-06-19 19:41:28 +01:00
Mattes D
8df31067d4 Externalized cPrefabPiecePool self-test. 2015-06-19 16:15:59 +02:00
Mattes D
ae16689420 PrefabPiecePool: Added loading from cubeset file. 2015-06-18 23:32:43 +02:00
Tiger Wang
6920e468ad Check the return value of InflateString 
Fixes #2256
 2015-06-18 11:19:41 +01:00
Mattes D
c6012a95bd LuaState: Added support for config-style usage. 
Globals and table values can be queried from the Lua state easily.
Use perfect forwarding.
 2015-06-17 17:13:45 +02:00
Tiger Wang
813ca04676 Fixes #2245 
Whoops :/
 2015-06-17 00:27:50 +01:00
tycho
6687ed03a1 Removed version 29 serilization 
This has been unused since support for <1.7 has been dropped.
 2015-06-16 10:24:06 +01:00
tycho
b259ab53fb Fixed override 
This was causing a compile error in clang 3.6
 2015-06-15 18:03:54 +01:00
Tiger Wang
f8c7efdcd7 Merge pull request #2244 from martindev2/#2092-TNT-Fire 
Fix block placement over fire
 2015-06-14 22:01:09 +01:00
worktycho
0cd64ab90b Fixed tigers format string 2015-06-14 13:18:01 +01:00
Martin McArthur
d8865339f5 implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on top 2015-06-14 12:53:09 +01:00
Tiger Wang
882f7c70c0 Fixed log files' timestamps 
Also made Release mode log less technical information about the world
storage threads.
 2015-06-14 11:23:14 +01:00
Lane Kolbly
9d620a20a0 Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld. 2015-06-13 16:09:43 -05:00
worktycho
d961693020 Merge pull request #2237 from lkolbly/master 
Fixing how village doors are generated in 1.8.
 2015-06-13 21:55:36 +01:00
NiLSPACE
8ecd545857 Merge pull request #2240 from cuberite/UpdatedPrefabs 
Updated prefabs from the Gallery server.
 2015-06-13 18:29:46 +02:00
Mattes D
ec4bd42dd8 Updated prefabs from the Gallery server. 2015-06-13 18:14:09 +02:00
Lane Kolbly
dafdded7d9 Fixed typo in BlockDoor.h 2015-06-13 08:00:20 -05:00
Nounours Heureux
d79f601d5a Added HOOK_KILLED 2015-06-13 10:00:31 +02:00
Mattes D
f0ee0b8ce8 NetherPortalScanner: Fixed type conversion warnings. 2015-06-13 08:46:05 +02:00
Alexander Harkness
ee3082a3c5 If defined, not just if. 2015-06-12 12:37:22 +01:00
Alexander Harkness
070801d561 Fixed build error on Linux 2015-06-12 11:57:34 +01:00
Mattes D
d390214929 SelfTests are registered and executed after logging framework init. 
Fixes #2228.
 2015-06-11 22:20:04 +02:00
Tiger Wang
dd4b415051 Reinstate "Chunk queue collapsing" 
This reinstates commit f36acb6835
     and reverts commit adfbc42c02.
 2015-06-10 15:16:05 +01:00
Mattes D
d436a71cbc Merge pull request #2162 from lkolbly/master 
Nether Portal Jumping & Creation Code
 2015-06-10 08:00:50 +02:00
Lane Kolbly
73b6a44d5f Implemented nether portal scanning code. 2015-06-09 18:23:57 -05:00
Alexander Harkness
1e77f27191 Merge pull request #2144 from mc-server/comparators 
Redstone improvements [SEE DESC]
 2015-06-09 09:15:08 +01:00
Mattes D
db863422b8 cBlockArea: Added CountSpecificBlocks() API function. 2015-06-08 21:52:13 +02:00
worktycho
adfbc42c02 Revert "Chunk queue collapsing" 2015-06-07 20:45:47 +01:00
Alexander Harkness
f1a3535d6e Merge pull request #2210 from nounoursheureux/bucket-craft 
Cake crafting now give back the bucket
 2015-06-07 14:43:16 +01:00
Alexander Harkness
e2c4a0a595 Merge pull request #2211 from jan64/master 
Fix incorrent experience sending for 1.7 clients
 2015-06-07 14:41:27 +01:00
Nounours Heureux
24210cbd6f Fixed style 2015-06-07 15:22:47 +02:00
jan64
be4a5a0803 Fix incorrent experience sending for 1.7 clients 2015-06-07 15:21:18 +02:00
Nounours Heureux
1a7e8f3e4f Cake crafting now give back the bucket 2015-06-07 15:03:47 +02:00
Tiger Wang
061866616d Added moar comments 2015-06-07 12:54:07 +01:00
Tiger Wang
f44d123ba8 Vector hasher is now a separate class 2015-06-07 12:53:59 +01:00
Tiger Wang
ed6c37febc Use emplace to construct structures 2015-06-06 12:30:08 +01:00
Tiger Wang
a6983ec3c9 Improved link unpowering speed 
Also fixed compile errors
 2015-06-06 12:21:22 +01:00
Tiger Wang
171c59a01b Changed appropriate containers to unordered_map 
Thanks to @worktycho for guidance!

* Potential speed improvements
 2015-06-06 12:21:21 +01:00
Tiger Wang
6a831c0b6f Improved link power behaviour 2015-06-06 12:21:21 +01:00
Tiger Wang
bef7cce5ed Improved wires and repeaters 
* Fixed repeater cross-chunk power detection
+ Re-implemented horizontal wire cut-off checking
 2015-06-06 12:21:20 +01:00
Tiger Wang
151fe0fc59 Fixed wire consuming much resources 2015-06-06 12:21:19 +01:00
Tiger Wang
84534dfeb2 Redstone wire and trapdoor fixes 
* Fixes #1887
* Fixes #1763
* Fixes #1083
 2015-06-06 12:21:19 +01:00
Tiger Wang
bd48475085 Provides improvements to redstone wire 
Intermediary commit that fixes #1763.
 2015-06-06 12:21:18 +01:00
Tiger Wang
de5b1401f8 Comparators 2015-06-06 12:21:09 +01:00
Tiger Wang
f36acb6835 Merge pull request #2179 from mc-server/ChunkQueueCollapsing 
Chunk queue collapsing
 2015-06-06 10:55:12 +01:00
worktycho
54c1926a3a Merge pull request #2205 from birkett/master 
Daemon support on Linux
 2015-06-05 22:33:49 +01:00
tycho
ffbe5f6a2f Fix iterating 2015-06-05 22:31:22 +01:00
tycho
9ebbe969c8 Made the list of chunks to stream an unordered_set 
This should increase performance of chunk streaming
 2015-06-05 22:31:22 +01:00
tycho
bfe52277b4 Rewrote ChunkSending queue for significantly improved performance 2015-06-05 22:31:21 +01:00
tycho
19c95ee564 Moved Chunk Broadcasts over to the regular queue 2015-06-05 22:31:21 +01:00
Anthony Birkett
9dac390247 Daemon support on Linux. 
Added null console log listener, avoid printf() when stdout is closed.
 2015-06-05 15:47:47 +01:00
worktycho
519fd1d36d Merge pull request #2206 from mc-server/APIDumpTimeStamp 
APIDump time stamp
 2015-06-05 13:04:28 +01:00
Mattes D
1ec9665118 Fixed overshoot in cLineBlockTracer. 
Fixes #2161.
 2015-06-05 11:29:54 +02:00
Mattes D
99b182b4be Added Build info to the cRoot API. 2015-06-05 10:34:13 +02:00
Mattes D
649921f4a8 Provide some BuildInfo even for non-CI builds. 
Ref.: #2204
 2015-06-05 10:19:58 +02:00
Mattes D
5267285529 Merge pull request #2069 from HaoTNN/master 
Fixes lit furnace issue in #2051
 2015-06-05 10:12:10 +02:00
worktycho
c9ad1ecd3e Merge pull request #2203 from jan64/master 
Change SendChatType behavior for < 1.8 clients, update docs
 2015-06-04 11:28:43 +01:00
Cengiz Can
c967698b2d Skip unknown cflag for Apple clang & remove cSemaphore 2015-06-04 11:48:56 +03:00
jan64
fd964200b2 Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clients 2015-06-03 18:11:12 +02:00
HaoTNN
6f1a3cb6dd Merge remote-tracking branch 'upstream/master' 2015-06-03 02:57:07 -07:00
HaoTNN
e82cd6e4eb Fixes multiple furnace issues, including from loading world storage 2015-06-03 02:19:22 -07:00
Mattes D
1f2c9b226c Merge pull request #2199 from jan64/master 
Added system and above action bar chat messages
 2015-06-03 09:49:28 +02:00
HaoTNN
3142598dee Merge branch 'master' of https://github.com/mc-server/MCServer 2015-06-02 16:08:57 -07:00
jan64
d37e0eb72b Added system and above action bar chat messages 2015-06-02 19:59:46 +02:00
Mattes D
a0a8e78c0d Added cmdline params for crashdump detailness. 
Win32-only, also fixed the call scripts.
Fixes #2184.
 2015-06-02 15:19:13 +02:00
Mattes D
a42daecd0b Merge pull request #2182 from birkett/master 
Use the new style command line parameters for Windows Service support.
 2015-06-02 15:05:05 +02:00
Mattes D
48c153bf53 Fixed warnings in MSVC. 
It complained about undefined return values or using uninitialized variables.
 2015-06-02 12:51:43 +02:00
Anthony Birkett
65a62601dc Use the new style command line parameters for Windows Service support. 
Ignore invalid or malformed command line parameters, prevent unhandled exceptions.
NOTE: Users will need to reinstall the service, now uses "-d" instead of "/service" in the start parameters.
 2015-06-01 14:41:06 +01:00
Mattes D
a54fa15bc6 Merge pull request #2172 from mc-server/LightingCallbacks 
Made cLightingThread own its callbacks
 2015-06-01 15:02:42 +02:00
Mattes D
25e83bc1d9 Fixed crafting recipe matching. 
Fixes #2096.
 2015-05-31 21:21:57 +02:00
Mattes D
98df75d5ab ManualBindings: Fixed DoWithXYZ and ForEachInChunk signatures. 
Fixes forum report http://forum.mc-server.org/showthread.php?tid=1993
 2015-05-31 19:44:08 +02:00
tycho
9b798ff9dd Merge branch 'master' of github.com:mc-server/MCServer 2015-05-30 13:34:08 +01:00
tycho
bca13d9187 Fixed minor cast warning 2015-05-30 12:31:05 +01:00