madmaxoft
054ce9bcc4
Anvil: Wolf owner not saved if not present.
2014-08-04 11:29:40 +02:00
madmaxoft
3136fc6246
Wolf uses UUID for owner.
...
Fixes #1277 .
2014-08-03 22:04:52 +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
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
e8262373e1
NBTChunkSerializer.cpp: Added break after serializing the splash potion
2014-07-20 03:19:46 -07: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
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +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
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
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
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
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
9c7a6bc443
Health of monsters is now saved
2014-06-04 20:09:02 +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
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
Tycho
d478e3cfb1
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.h
2014-05-10 05:05:44 -07: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
8780b324ff
Merge branch 'master' into chunksparsing/structs
2014-05-01 11:50:40 -07: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
Tycho
57b8ee9163
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.cpp
src/Chunk.h
2014-04-27 06:35:27 -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