1
0
Fork 0
Commit Graph

205 Commits

Author SHA1 Message Date
madmaxoft fc7da22738 WSSAnvil: Removed leftover debugging code. 2014-08-30 22:11:52 +02:00
Mattes D 22e3bbd0db Rewritten block entity loading.
Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked.
The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't.
Fixes #1354.
2014-08-29 19:19:47 +03:00
madmaxoft 1fa210c7f9 Refactored case-conversion functions.
StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
2014-08-04 11:30:20 +02:00
madmaxoft 3136fc6246 Wolf uses UUID for owner.
Fixes #1277.
2014-08-03 22:04:52 +02:00
Howaner 6b1f7e7a45 Renamed "select..." methods to "set..." and better IsValidEffect() function. 2014-07-31 18:15:39 +02:00
Howaner 556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +02:00
Howaner dcd226d904 Added beacon load/save. 2014-07-30 22:50:34 +02:00
Tiger Wang 4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Tiger Wang 8811837aea Merge branch 'master' into portals
Conflicts:
	src/World.h
2014-07-29 15:27:19 +01:00
archshift 0298d34406 Moved potion static functions to EntityEffect to create splash potions through world 2014-07-26 03:48:16 -07:00
madmaxoft c0b62ef139 Added a queue for setting chunk data.
Fixes #1196.
2014-07-24 18:32:05 +02:00
Tiger Wang 3385ed56b8 Merge remote-tracking branch 'origin/master' into portals
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
2014-07-22 10:24:28 +01:00
archshift f5bcfdc58c Splash potions: Renamed PotionParticleType to PotionColor for clarity 2014-07-19 02:51:39 -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 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
archshift 8cbd43e043 Added splash potions to NBT serialization and retrieval 2014-07-11 18:58:11 -07: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 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 89a26cc786 Suggestions 2014-07-02 21:07:34 +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
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
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
Mattes D fb58ef55be Fixed MSVC 64-bit build warnings. 2014-05-09 18:32:03 +02: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
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
archshift 9b0cb3fd97 Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -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
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 8fc45c5730 Fixed class capitalization for the cave spider. 2014-04-24 12:18:17 -07: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
andrew 6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02: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 2eca30aebc Removed Some unnessicary macros 2014-03-10 11:34:20 -07:00
Tiger Wang 09c5542123 Merge pull request #768 from Howaner/BlockEntitys
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang c2978a3457 Merge branch 'master' into ballisticmissiles
Conflicts:
	src/ClientHandle.cpp
2014-03-09 12:53:50 +00: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
Howaner 787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
Tiger Wang baf2d88921 Implemented ballistic missiles (fireworks)
+ Added fireworks
2014-02-26 23:33:52 +00:00
TheJumper 2cc597372a Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters 2014-02-23 19:50:51 +01:00
Howaner 1f726b7d9d Rename SkullEntity to MobHeadEntity 2014-02-23 19:50:50 +01:00
Howaner 7bc5946883 Add Heads completely 2014-02-23 19:50:50 +01:00
Howaner ab2eba17ec Add Skulls/Heads 2014-02-23 19:50:50 +01:00
STRWarrior 8470841f84 Fixed #573 2014-02-12 19:07:17 +01:00
Kirill Kirilenko a134fd45cf Added saving of angry flag. 2014-02-02 14:28:42 +04:00
Kirill Kirilenko a1c36c18e0 Fixed sitting tag. 2014-02-02 13:56:55 +04:00
Kirill Kirilenko 0259aed8be Added saving of collar's color. 2014-02-01 20:16:42 +04:00
Kirill Kirilenko 8180b643ff Added reading saved state of the wolf (sitting or standing). 2014-01-31 21:34:00 +04:00
STRWarrior 19e5122b77 Inversed condition. 2014-01-31 16:31:55 +01:00
STRWarrior c7e4ade7c3 Wolf: If Owner tag is missing a normal ownerless wolf will spawn. 2014-01-31 16:27:21 +01:00
STRWarrior 550a09020d Fixed bad variable. 2014-01-30 21:49:39 +01:00
STRWarrior 1a361be44f Check if the tag is found. 2014-01-30 21:46:45 +01:00
STRWarrior 419778a306 Fixes #606 2014-01-30 21:39:31 +01:00
madmaxoft 61848ff5a0 Item-loading now checks for weird bytes. 2014-01-26 17:56:11 +01:00
madmaxoft b02940209d Fixed crash with failed entity-loading.
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
2014-01-24 09:57:12 +01:00
andrew 9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew 7728f4bcbe Scoreboard deserialization 2014-01-20 16:10:39 +02:00
Mattes D 865016abe2 Merge pull request #569 from worktycho/EnchantmentsFix
Enchantments fix
2014-01-19 13:50:50 -08:00
Tycho f13a14d2cf Switched EnchantmentSerilizer to namespace 2014-01-19 08:52:45 -08:00
Tycho e14ddff1c0 Spilt Writing of Enchantments to seperate class
Created a new class cEnchantmentSerializer to serilize Enchantments to NBT.
This breaks a dependecy chain between cChunkGenerator and cWorld.
cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments
so having it seperate reduces the spread of the frein modifier
2014-01-19 07:38:59 -08:00
andrew 1ad6469a18 Command blocks: Execute() 2014-01-18 16:59:33 +02:00
andrew be5299350a Command block (de)serialization 2014-01-18 15:40:47 +02:00
Tycho a54cbba0fd Added user setting compression factor 2014-01-17 11:01:14 -08:00
Mattes D 79c1f6f438 Merge pull request #534 from mc-server/SpawnMinecart
Added cWorld::SpawnMinecart.
2014-01-17 02:27:56 -08:00
Tiger Wang 74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
STRWarrior f11427e8cd Renamed cEmptyMinecart to cRideableMinecart 2014-01-12 18:04:41 +01:00
STRWarrior c5603ce064 EmptyMinecarts should be able to get a block inside of them. 2014-01-12 15:27:50 +01:00
Tiger Wang 548273c8f7 Preliminary mobile entity saving
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
2013-12-25 16:07:52 +00:00
madmaxoft 8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
Alexander Harkness d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Tiger Wang 32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness 675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00