flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,528 Commits 1 Branch 0 Tags 92 MiB
237d8fa501
Commit Graph

343 Commits

Author SHA1 Message Date
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
archshift
e8262373e1 NBTChunkSerializer.cpp: Added break after serializing the splash potion 2014-07-20 03:19:46 -07:00
madmaxoft
08748bafe2 Code style: Fixed braces on separate lines. 2014-07-19 15:23:40 +02:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
Mattes D
4293db5eae Merge pull request #1214 from mc-server/anti-glob 
CMake - Explicitly lists all source files
 2014-07-19 14:29:22 +02:00
archshift
f5bcfdc58c Splash potions: Renamed PotionParticleType to PotionColor for clarity 2014-07-19 02:51:39 -07:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
9fe4b61df3 WorldStorage/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:43 -07:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef Normalized comments. 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
 2014-07-17 22:15:34 +02:00
madmaxoft
cc452f51c8 Restructured cSplashPotionEntity code. 
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
 2014-07-15 22:41:42 +02:00
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
Howaner
4b093972ea Merge branch 'master' into Sheep 2014-07-13 00:54:11 +02:00
Tiger Wang
5f72cdac38 Merge pull request #1154 from mc-server/trappedchests 
Implemented trapped chests & others
 2014-07-12 23:24:32 +01:00
madmaxoft
e2e0f52ecb cNBTChunkSerializer: Fixed alignment. 2014-07-12 23:48:39 +02:00
Tiger Wang
e71e432633 Suggestions and bug fix 
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
 2014-07-12 22:06:25 +01:00
archshift
8cbd43e043 Added splash potions to NBT serialization and retrieval 2014-07-11 18:58:11 -07:00
Tiger Wang
6a33fa84ae Suggestions 2014-07-11 12:43:24 +01:00
Tiger Wang
372dbbb994 Merge pull request #1135 from mc-server/fixes 
Fixes to projectiles and the undead
 2014-07-09 09:50:38 +01:00
Tiger Wang
164ffe50ad Made things consistent 2014-07-08 12:34:39 +01:00
Tiger Wang
9e44b0aae1 Implemented trapped chests & others 
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
 2014-07-06 23:50:22 +01:00
Tiger Wang
f4e3c01a71 Various fixed 
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
 2014-07-04 16:49:24 +01:00
madmaxoft
632e8680b1 Removed world-saving log messages. 
Ref.: http://forum.mc-server.org/showthread.php?tid=1518
 2014-07-04 11:50:50 +02:00
Tiger Wang
89a26cc786 Suggestions 2014-07-02 21:07:34 +01:00
Tiger Wang
b94fef3089 Removed unneeded code 2014-06-30 19:15:10 +01:00
Tiger Wang
dde641ce83 Properly implemented enderchests 2014-06-29 11:36:38 +01:00
Howaner
20b32fc44e Code fixes. 2014-06-29 01:01:10 +02:00
Howaner
11d02a447e Save IsSheared from Sheep. 2014-06-28 13:19:32 +02:00
Tiger Wang
bd5df3d3b9 Merge branch 'master' of https://github.com/mc-server/MCServer into portals 2014-06-24 21:15:48 +01:00
Howaner
d4e1277724 Add entity health saving. 2014-06-24 16:06:26 +02:00
Tiger Wang
7615ed90c0 Merge branch 'master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
 2014-06-21 22:14:23 +01:00
madmaxoft
79c1966290 MCA saver marks chunks as populated. 
Fixes #140.
 2014-06-20 21:30:11 +02:00
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
46b84aa8b6 The motion is already set in AddBasicEntity() 2014-06-17 01:17:35 +02:00
Tiger Wang
ea49abd113 Time and weather is saved, part of #1058 
Also fixed unreliability in Health and LootPickup loading.
 2014-06-04 20:52:54 +01:00
Tiger Wang
9c7a6bc443 Health of monsters is now saved 2014-06-04 20:09:02 +01:00
Tiger Wang
c4e0da2d0a Fixed mob loading, part of #1058 2014-06-04 09:22:19 +01:00
Howaner
142fa83124 Code improvements 2014-05-28 19:32:20 +02:00
Howaner
e7a7c45c36 Add throw sound and fix arrow server crash. 2014-05-28 16:39:59 +02:00
Tycho
4ab8288116 Merge branch 'master' into chunksparsing/structs 2014-05-24 12:44:49 +01:00
Tycho
024027db89 Renamed cChunkBuffer to cChunkData 2014-05-21 19:58:48 +01:00
Mattes D
ac00568183 Merge pull request #998 from mc-server/StatManager 
Statistic Manager
 2014-05-18 22:30:34 +02:00
Tycho
8a0d3f7921 Fixed issue with types not being defined for an unused parameter 2014-05-18 15:37:17 +01:00
andrew
466ff2204f Fixes 2014-05-13 14:53:15 +03:00
archshift
3a5e04d118 More switch warnings. 2014-05-11 16:54:42 -07:00
archshift
3f9e00a3f3 Fixed a few more switch warnings. 2014-05-11 16:28:48 -07:00
archshift
6c57b38b74 Fixed a warning and a complaint about a never-read variable. 2014-05-11 13:44:30 -07:00
andrew
e3c6c8f3dd Fixed stat serialization 2014-05-11 20:30:54 +03:00
andrew
c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Tycho
d478e3cfb1 Merge branch 'master' into chunksparsing/structs 
Conflicts:
	src/Chunk.h
 2014-05-10 05:05:44 -07:00
Mattes D
a38d8b6513 Merge pull request #992 from mc-server/coverity_fixes 
Coverity fixes
 2014-05-09 21:20:27 +02:00
Mattes D
a2e18f0e01 Fixed size_t in FireworksSerializer. 2014-05-09 20:32:27 +02:00
Mattes D
1a5a123301 Fixed message formatting. 2014-05-09 20:16:29 +02:00
Mattes D
294b7ca24a Even more size_t fixes. 2014-05-09 20:05:00 +02:00
Mattes D
d67ea97a26 More size_t fixes. 2014-05-09 19:57:59 +02:00
Mattes D
5b54dc3eac Build fixes after the last size_t batch. 2014-05-09 19:33:22 +02:00
worktycho
c4cd201f18 Range Check on schematic size 
Fixes CID 55830
 2014-05-09 17:39:13 +01:00
Mattes D
fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02:00
worktycho
99af4453ef Check the height and width values read. 
Fixes CID 55831
 2014-05-09 17:30:47 +01:00
Mattes D
d1b719885d Merge pull request #989 from Howaner/Anvil 
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
 2014-05-07 22:18:53 +02:00
Howaner
fbb6404cc8 Change m_RepairCost to int. 2014-05-07 20:43:37 +02:00
Howaner
80bcc43c7b Fix MagmaCube save. 2014-05-07 12:43:21 +02:00
Howaner
d6cb6e0423 Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. 2014-05-07 12:30:30 +02:00
Tycho
ec407dd27d Merge branch 'master' into chunksparsing/structs 
Conflicts:
	src/Chunk.cpp
 2014-05-03 06:07:56 -07:00
madmaxoft
b6b86b7270 Fixed warnings in FastNBT. 2014-05-01 22:43:37 +02:00
Tycho
8780b324ff Merge branch 'master' into chunksparsing/structs 2014-05-01 11:50:40 -07:00
madmaxoft
772b57ca04 Anvil saver pads data to 4K boundaries. 
Fixes #524.
 2014-05-01 18:00:10 +02:00
Mattes D
709015369d Merge pull request #940 from Howaner/GlobalFixes 
Add entity invulnerable
 2014-04-28 20:58:15 +02:00
Howaner
26e935cb20 Revert "Changed the old invulnerable methods from the wither to the new." 
This reverts commit d50f8f6f11.
 2014-04-28 13:51:22 +02:00
Mattes D
c063051645 Merge pull request #954 from mc-server/projectiles-split 
Totally refactored ProjectileEntity.h, splitting up into several files.
 2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
Mattes D
a0f6149d05 Merge pull request #948 from jfhumann/staticFixes 
Fixes motivated by Coverity #1
 2014-04-27 17:00:37 +02:00
Tycho
57b8ee9163 Merge branch 'master' into chunksparsing/structs 
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
 2014-04-27 06:35:27 -07:00
archshift
cb93a57963 Moved cGhastFireballEntity out of ProjectileEntity.h 2014-04-26 17:41:07 -07:00
archshift
de7eaa5735 Moved cFireChargeEntity out of ProjectileEntity.h 2014-04-26 17:35:31 -07:00
archshift
08b77f4880 Moved cThrownSnowballEntity out of ProjectileEntity.h 2014-04-26 17:24:44 -07:00
archshift
bc5c28a0be Moved cThrownEnderPearl out of ProjectileEntity.h 2014-04-26 17:08:39 -07:00
archshift
de23a115a5 Moved cThrownEggEntity out of ProjectileEntity.h 2014-04-26 17:02:47 -07:00
archshift
477b3e7861 Moved cArrowEntity out of ProjectileEntity.h 2014-04-26 16:45:39 -07:00
Tycho
e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07:00
archshift
aef2c8ec62 Further refactored, Reverted Minecart change 
Other small changes.
 2014-04-26 09:25:30 -07:00
Howaner
d50f8f6f11 Changed the old invulnerable methods from the wither to the new. 2014-04-26 17:47:25 +02:00
Howaner
49f6819829 Fixes 2014-04-26 16:44:15 +02:00
archshift
b2f40a7a11 Removed unused assignments. 2014-04-25 18:18:46 -07:00
jfhumann
c8d5fcfffa Fix for minor resource leak (CID 43616) 2014-04-26 00:43:01 +02:00
archshift
d64e46186f Merge remote-tracking branch 'upstream/master' 2014-04-25 10:50:10 -07:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
archshift
62e5234535 Small changes; warning fixing. 2014-04-24 20:25:03 -07:00
archshift
8fc45c5730 Fixed class capitalization for the cave spider. 2014-04-24 12:18:17 -07:00
archshift
06819595b0 Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes 
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
 2014-04-18 21:44:58 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tiger Wang
82b3d543e7 Rewrote redstone powering to use power levels 2014-04-15 13:15:56 +01:00
Tycho
10e72a122c Removed check for enqueuing a chunk that is already enqueued to be loaded 
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
 2014-04-08 08:43:28 -07:00
madmaxoft
396abb5db6 Fixed silly Clang's warnings in FastNBT. 2014-04-04 10:19:21 +02:00
Tycho
b449ad8613 Merge branch 'MacFixes' 
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
 2014-04-02 06:54:57 -07:00
madmaxoft
bcd7f9669b Added schematic string serializer self-test. 2014-04-02 11:56:27 +02:00
madmaxoft
87e0bd54b4 BlockArea: Switched internal coords to Vector3i. 2014-03-25 21:59:41 +01:00
Mattes D
cac5149974 Merge pull request #833 from mc-server/EnderCrystal 
Ender crystals
 2014-03-25 21:02:23 +01:00
andrew
2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
Samuel Barney
71e9133e49 Added one more missing newline. 2014-03-25 10:34:31 -06:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
madmaxoft
9447cd20f3 Fixed a crash in firework rockets. 
Fixes #816.
 2014-03-17 22:12:02 +01:00
Mattes D
dc77cbfdc4 Merge pull request #809 from Howaner/BlockEntitys 
More entity saving.
 2014-03-16 21:43:33 +01:00
Howaner
b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
Howaner
4e0edc9fa7 Add anvil direction. 2014-03-16 17:42:23 +01:00
Howaner
d6edd5f24e Remove old debug messages. 2014-03-15 11:53:55 +01:00
Howaner
8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91 Add item frame saving. 2014-03-15 02:45:25 +01:00
Howaner
cf13739288 Add health and age load to pickup's. 2014-03-15 00:43:38 +01:00
Howaner
28898f710b Add ExpOrb saving. 2014-03-15 00:32:49 +01:00
Tycho
862e219443 Added additional macros to support the MSVC size_t format and changed all formats to use the macros 2014-03-12 10:34:50 -07:00
Tycho
d904e89712 Merge branch 'Werror' into warnings 
Conflicts:
	src/Globals.h
 2014-03-12 10:12:13 -07:00
Tycho
3caa4a38b9 Merge branch 'master' into Werror 
Conflicts:
	src/Generating/PieceGenerator.cpp
 2014-03-12 09:59:10 -07:00
madmaxoft
f2df33f746 Merge remote-tracking branch 'xdot/master' 2014-03-12 14:42:04 +01:00
Tycho
16b27c4b7a Fixed a load of format string errors 2014-03-11 14:16:08 -07:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
madmaxoft
950614da7e Renamed cBlockArea Offset to WEOffset. 
Even in getters / setters.
 2014-03-12 07:46:14 +01:00
madmaxoft
3e9f265a36 Merge branch 'master' into cBlockArea_Offset 2014-03-12 07:39:39 +01:00
STRWarrior
e213e5f9fc Renamed m_Offset to m_WEOffset 2014-03-11 18:23:21 +01:00
Tycho
98e15a34a4 Fixed xofts issues 2014-03-10 13:18:53 -07:00
Tycho
2eca30aebc Removed Some unnessicary macros 2014-03-10 11:34:20 -07:00
Tycho
8947f80294 Use string.reserve to avoid the need to do inplace byteswap 2014-03-10 11:24:12 -07:00
Tycho
cff6631513 Removed unused macro from WSSCompact 2014-03-10 11:14:34 -07:00
Tycho
8864e7d8ca Fixed alignment issues in Fireworks Serializer 2014-03-10 11:13:07 -07:00
Tycho
0a509ab85e Merge branch 'master' into Werror 2014-03-10 10:17:28 -07:00
STRWarrior
0cce0478d8 This allows a blockarea to have an Offset. 2014-03-10 17:07:46 +01:00
madmaxoft
0b9763fc5a Fixed MSVC2008 compilation. 2014-03-10 07:55:47 +01:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys 
Add TNT load/save
 2014-03-09 21:44:32 +00:00
Tycho
430aba9f1d Its a const not a macro 2014-03-09 10:10:36 -07:00
Tycho
02afa78b68 Take 5 2014-03-09 10:04:07 -07:00
Tycho
167ef3b7a1 Take 4 2014-03-09 09:52:49 -07:00
Tycho
ebf163b77a Unsigned types take 3 2014-03-09 09:45:59 -07:00
Tycho
e73caf30f0 Fix gcc error attempt 2 2014-03-09 09:33:40 -07:00
Tycho
f4201e0b82 Fixed gcc error 2014-03-09 09:25:16 -07:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00
Tiger Wang
76bf7ad813 Hexified colours 2014-03-09 12:49:00 +00:00
Tiger Wang
a2fb28dd08 Fixed data length issues 2014-03-09 12:48:59 +00:00
Tiger Wang
124fc8bc66 Demonstrated issues with GetDataLength() 2014-03-09 12:48:58 +00:00
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
Howaner
f5e374be41 Add TNT Save/Load and add Netbeans projects to .gitignore 2014-03-08 10:25:46 +01:00
madmaxoft
ffdf5f2022 Fixed cBlockArea schematic string saving signature. 2014-03-07 21:28:52 +01:00
Mattes D
f72c747b50 Merge pull request #763 from Howaner/BlockEntitys 
Add Flower Pots
 2014-03-07 17:54:10 +01:00
madmaxoft
97d803e34f Added cBlockArea serialization to string. 
Fixes #665.
 2014-03-07 09:17:13 +01:00