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

2523 Commits

Author SHA1 Message Date
archshift
481f05b011 Entity effects: Added handlers for entity effects 
Implemented hunger, instant health, damage, poison, regen

Added "template" entity effect implementations
 2014-06-17 11:39:19 -07:00
archshift
90145a9514 Added iterator on tick to manage entity effect duration 2014-06-17 11:17:33 -07:00
archshift
aa7b3f33b9 cPawn: Remove unused m_bBurnable 2014-06-17 11:17:33 -07:00
archshift
87b1bfaf2a Moved Effects.h to EntityEffects.h, added initial impl 2014-06-17 11:17:32 -07:00
archshift
c1692a2e3b Added classes for splash potions and wither skulls 2014-06-17 11:17:32 -07:00
Howaner
2da7768298 Merge branch 'master' into Blocks 2014-06-17 19:50:26 +02:00
Howaner
bcf798f260 Fix fence gate sound (Redstone simulator). 2014-06-17 19:47:32 +02:00
worktycho
2f2071afc1 Merge pull request #1101 from Howaner/FenceGate 
Fix fence gate redstone simulator.
 2014-06-17 18:39:21 +01:00
Howaner
bde51d8778 Add fence gate sound. 2014-06-17 19:08:36 +02:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
8de8768f02 Add UNUSED() Tags 2014-06-17 17:01:23 +02:00
Howaner
0d08b9a62e Add door sound 2014-06-17 17:00:51 +02:00
STRWarrior
008a6ce311 Added crBlocked and crNoPermission 2014-06-17 16:19:31 +02:00
STRWarrior
15ae4ce233 HandleCommand now returns an CommandResult enum. 2014-06-17 14:55:15 +02:00
Howaner
8e927e6e2b Check block type from cBlockEntity 2014-06-17 14:45:29 +02:00
Mattes D
f682646d3a Merge pull request #1099 from Howaner/Blocks 
Glass-made blocks don't drop pickups.
 2014-06-17 14:03:24 +02:00
Howaner
7e985f3c7d Add more documentation. 2014-06-17 13:44:07 +02:00
Howaner
ce06ec1632 derp 2014-06-17 13:33:41 +02:00
STRWarrior
8928310fd8 Fixed possible confusion. 
If a command handler gets an error then the player will receive an unknown command error. This can be confusing for players.
 2014-06-17 13:27:04 +02:00
Howaner
da88c98034 Add comment. 2014-06-17 13:25:36 +02:00
Howaner
a4d4621fbe Add parenthesis 2014-06-17 12:47:18 +02:00
Howaner
37de63895f The same: Float, not Double 2014-06-17 12:45:12 +02:00
Howaner
d89f03b90c Float, not Double 2014-06-17 12:43:45 +02:00
Howaner
1086b8ba05 Revert "Fix right click bugs." 
This reverts commit 61b6fdde75.
 2014-06-17 01:18:09 +02:00
Howaner
46b84aa8b6 The motion is already set in AddBasicEntity() 2014-06-17 01:17:35 +02:00
Howaner
a89524d533 Add DoWithBlockEntityAt() to WorldInterface.h 2014-06-17 01:15:38 +02:00
Howaner
1316d2d24d Add end lines to BlockPressurePlate.h 2014-06-17 00:41:31 +02:00
Howaner
43ff96f664 Add pressure plate handler 2014-06-17 00:40:35 +02:00
Howaner
a10b716ba2 Fix fence gate redstone simulator. 2014-06-17 00:22:57 +02:00
Howaner
a1fd0b0335 Split Broadcast Sound Effect function call in multiple lines. 2014-06-16 23:41:23 +02:00
Howaner
9dea609194 Fix doubleslab meta. 2014-06-16 23:35:30 +02:00
Howaner
7c4b8306aa Glass shouldn't drop. 2014-06-16 23:05:29 +02:00
Howaner
b45e85a678 This isn't needed 2014-06-16 22:57:27 +02:00
Howaner
885a50d77a Fix bow sound and creative arrow pickup. 2014-06-16 22:57:13 +02:00
madmaxoft
d6979ad95d Fixed GCC compilation. 2014-06-16 22:53:08 +02:00
madmaxoft
9c3086d88c Fixed MSVC builds. 2014-06-16 22:42:50 +02:00
Howaner
e50423991e Add bow charging animation 2014-06-16 21:57:23 +02:00
Tycho
74cd730589 FIxed second weird enum 2014-06-16 18:06:09 +01:00
Tycho
6fa99a211e Refactored reversing logic into seperate function 2014-06-16 17:55:58 +01:00
worktycho
4fddbf9dfc Merge pull request #883 from mc-server/CutOffLighting 
Lighting reads blocktypes only for blocks under heightmap.
 2014-06-16 17:37:07 +01:00
madmaxoft
d379f27ea4 Fixed gcc compilation. 2014-06-16 16:51:30 +02:00
Tycho
3a7c0c8ce9 Fixed tigers weird enums 2014-06-16 15:29:49 +01:00
Tycho
d5c84b5fe6 Merge branch 'master' into redstonerefactor 
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-06-16 15:22:02 +01:00
Tycho
ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
Tycho
aa3537112d Moved repeater handling to seperate pass 2014-06-16 15:07:41 +01:00
Tycho
84c83e0deb Fix a few warnings 2014-06-16 15:03:07 +01:00
madmaxoft
6b503b45a0 Fixed a copypasta error in WormNestCaves generator settings. 2014-06-16 14:53:33 +02:00
madmaxoft
c41299b4d4 Updated the SandFlatRoofVillage prefabs. 2014-06-16 10:18:44 +02:00
madmaxoft
d9719e696c Added random offsets to cGridStructGen. 
Fixes #740.
 2014-06-15 23:34:44 +02:00
Mattes D
a72ec6300d Merge pull request #1090 from mc-server/saveoncrash 
Data is saved on crash
 2014-06-15 23:16:37 +02:00
Tiger Wang
abbd11be6d Players are saved regularly 
* Fixes #1076
 2014-06-15 20:28:08 +01:00
Tiger Wang
f822a46bdb Fixed bad comparison crash 
* Fixes #1095
 2014-06-15 19:42:14 +01:00
Tiger Wang
2a6ca71a0b Fixed daylight sensor unpowering 
* Fixes #1094
 2014-06-15 16:27:20 +01:00
Mattes D
c684812b30 Merge pull request #1019 from mc-server/cPlayerSetSpeed 
cPlayer set speed
 2014-06-14 18:57:32 +02:00
madmaxoft
493d364331 Removed an unused tolua_end and tolua_begin pair. 2014-06-14 18:23:27 +02:00
madmaxoft
a89422ea4c Simplified speed clamping. 2014-06-14 18:16:10 +02:00
madmaxoft
3f009a7c9e Refactored speed-setting to use a common function for all cases. 2014-06-14 17:10:53 +02:00
Mattes D
f1e3010839 Fixed bindings generation for Win64 builds. 
Fixes #1092.
 2014-06-14 15:47:37 +02:00
Mattes D
af981cc718 Fixed MSVC Bindings generation. 2014-06-14 15:00:57 +02:00
worktycho
d5a99d5b78 Remove windows bindings crutch 2014-06-14 13:48:12 +01:00
madmaxoft
f8f7748a09 Merge branch 'master' into cPlayerSetSpeed 2014-06-14 12:06:48 +02:00
Tiger Wang
c1deda5d8f Fixed a repeater issue 
* Repeaters now properly continuously update their powering
* Minor cosmetic improvements
 2014-06-14 10:47:10 +01:00
Tiger Wang
4b28a24514 Reduced cPluginManager code duplication 2014-06-14 09:51:42 +01:00
Mattes D
90e3e2b4e6 Merge pull request #1089 from mc-server/tolua-auto 
automaticlly build tolua and generate bindings as part of build.
 2014-06-13 16:32:34 +02:00
madmaxoft
f76420ac55 Removed an unused fwd declaration. 2014-06-13 09:38:25 +02:00
tycho
9254666a85 automaticlly build tolua and generate bindings as part of build. 2014-06-12 18:00:53 +01:00
Tiger Wang
1bce1ac432 Fixed two redstone bugs 
* Fixed chunk border powering
* Fixed quick place-replace powering
 2014-06-12 17:13:52 +01:00
Alexander Harkness
db4d786a84 Merge pull request #1082 from mc-server/cauldronfixes 
Add biome-aware downfall functions.
 2014-06-12 16:50:08 +01:00
STRWarrior
a6a87f1996 Merge pull request #1084 from mc-server/PlankRoads 
Plank Roads
 2014-06-11 22:13:05 +02:00
madmaxoft
220e6f5880 DispenserEntity code cleanup after PR merge. 2014-06-11 19:46:24 +02:00
madmaxoft
d6b2660f36 Merge remote-tracking branch 'joannis/master' 2014-06-11 19:38:14 +02:00
STRWarrior
7cf544079f Roads in villages are made out of wooden planks if they generate on water. 2014-06-11 19:12:29 +02:00
Alexander Harkness
f9fd519360 Changed the teleport permissions to the new ones. 2014-06-11 17:26:10 +01:00
worktycho
70c20d7772 Fixed constness 2014-06-11 17:17:19 +01:00
archshift
aa7c82580f Player.h: Moved doxy-comments to Entity.h 
Moved doxy-comments to the defining function in Entity.h rather than the overloaded functions in Player.h
Comment for each function (instead of assumed encapsulating comments)
@deprecated tag for ForceSetSpeed()
 2014-06-11 07:52:34 -07:00
Tiger Wang
e24830f0b1 Compile fix 2014-06-11 13:49:57 +01:00
Tiger Wang
1a9467574e Reduced code duplication 
call @maxmaxoft!
calling...
call connected (0:20)
call ended
 2014-06-11 13:40:34 +01:00
Tiger Wang
f7913d3b74 IsWeatherSunnyAt does something useful :D 2014-06-11 13:37:04 +01:00
madmaxoft
b3300e3854 Added cBlockArea:GetCoordRange to Lua API. 2014-06-11 14:22:27 +02:00
Alexander Harkness
c09207cabc SMICOLOSL 
Meant to be semicolons up there.
 2014-06-11 13:20:31 +01:00
madmaxoft
7e4abcfe2d Revert "Initial Mesa Bryce implementation." 
This reverts commit 1ff1a93866.
 2014-06-11 14:15:18 +02:00
Tiger Wang
711113cd2b Updated unnecessary function :/ 2014-06-11 13:10:10 +01:00
Alexander Harkness
c5010ebcc1 Add DoxyComments to he weather things. 
Also changed the function names.
 2014-06-11 13:01:52 +01:00
Alexander Harkness
c3c3782c67 Add new IsWeatherWet hook for cauldrons. 
@madmaxoft can you comment?
 2014-06-11 10:33:16 +01:00
worktycho
3e25852382 Removed assert that is now informed by type system 2014-06-11 10:04:34 +01:00
madmaxoft
1ff1a93866 Initial Mesa Bryce implementation. 2014-06-10 22:59:45 +02:00
madmaxoft
c259dad7b8 Fixed clang warnings about abs() in Noise.cpp. 
MSVC provides a float overload of abs(), clang does not. Using the proper fabs().
 2014-06-10 18:27:17 +02:00
madmaxoft
366ecf9dfd Fixed a race condition when adding a player to a world. 2014-06-10 18:25:53 +02:00
madmaxoft
6c43799cc5 Fixed gcc compilation. 2014-06-10 09:20:32 +02:00
madmaxoft
9ff0ef87d4 Added an experimental height generator, Mountains. 2014-06-09 23:40:51 +02:00
madmaxoft
bead36f5ed Added cRidgedMultiNoise, fixed cPerlinNoise. 2014-06-09 23:38:50 +02:00
madmaxoft
2b45e720ad Added Y coord checks and documentation to cBlockDoorHandler. 2014-06-09 21:35:46 +02:00
madmaxoft
dcc71a3b7b Merge remote-tracking branch 'howaner/Redstone' 2014-06-09 21:20:26 +02:00
madmaxoft
02b509b81d ToLua can now be run in pure-lua mode. 
See the src/Bindings/AllToLua_lua.bat for usage example.
 2014-06-09 17:05:22 +02:00
madmaxoft
ec0976f9b0 Fixed a crash when creating negative-size blockareas. 
Now the server emits a warning instead and continues execution.
 2014-06-09 00:49:02 +02:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d Added queue for adding entities to cWorld. 
This alone doesn't work properly yet, further changes to cPlayer are needed.
 2014-06-08 21:58:29 +02:00
madmaxoft
28b82d5bbb Proper fix for long interaction. 
Fixes #1078 and #1038.
 2014-06-08 11:32:52 +02:00
madmaxoft
0544b96f80 docs/Generator: Added the easy Finishers. 2014-06-07 13:59:51 +02:00
madmaxoft
ec40c7c83a Added RainbowRoads finisher generator. 2014-06-07 13:59:50 +02:00
Tiger Wang
d5649df326 Further improvements on redstone speed 
Based on suggestions of @worktycho
* Repeaters now walk their data structure only when needed
* Fixed a bug with cChunkData returning an incorrect value for whether a
meta had changed
 2014-06-07 10:39:36 +01:00
archshift
b768e54ce8 Fixed mob hitbox sizes, removed TODOs 
Measured bat and blaze in vanilla, updated values.
Cavespiders are, in fact, passive in the day.
 2014-06-07 00:40:01 -07:00
Tiger Wang
5f56773dde Further reduced redstone idle CPU consumption 
* Repeaters and wires are no longer unnecessarily ticked
* Fixed #1063, likely addressed #1062
* Fixed bugs regarding duplicate values
 2014-06-06 20:36:50 +01:00
JoannisO
720ae4f757 - Fixed a lot of alignment 2014-06-05 12:26:27 +02:00
Tiger Wang
22236a103a Redstone fixes and improvements [SEE DESC] 
Haha, see desc.

* Improved redstone speed through a marking dirty system. Only a select
few devices are still continuously simulated
* Fixed redstone crashing with recent piston changes
 2014-06-04 23:23:22 +01:00
Mattes D
c11488ccd7 Merge pull request #1011 from SphinxC0re/SomeWarningFixes 
Fixed some warnings
 2014-06-04 18:02:45 +02:00
Howaner
33fbdedea3 Fix itemframe break. 2014-06-04 15:16:30 +02:00
JoannisO
852e162f95 - Removed the code that removed fireworks from a dispenser even thought 
they weren't launched.
 2014-06-04 12:40:01 +02:00
worktycho
c94d0c8144 derp 2014-06-04 11:39:21 +01:00
JoannisO
e5b345a9c9 - Fixed variable names in a function. 2014-06-04 12:37:51 +02:00
JoannisO
2c103a713e - Fixed a lot of astethics 2014-06-04 12:35:45 +02:00
worktycho
ae37dfec8d Fixed bad coordinate 2014-06-04 11:29:08 +01:00
worktycho
98c575ebc2 Make sure m_StackSizeToBeUsedInRepair Always has a valid value 2014-06-04 11:12:06 +01:00
worktycho
85be62a8cd Removed unused field test 2014-06-04 11:02:17 +01:00
worktycho
87c4d0ea57 Initialise m_Callbacks field to NULL in empty constructor. 2014-06-04 10:58:09 +01:00
Tiger Wang
9ef4b9d52d Exploded creepers drop nothing, part of #1058 2014-06-04 09:27:50 +01:00
Tiger Wang
c4e0da2d0a Fixed mob loading, part of #1058 2014-06-04 09:22:19 +01:00
Tiger Wang
8e57f75622 Fixed #1057 2014-06-04 09:21:44 +01:00
Julian Laubstein
8604dedfdf Update IncrementalRedstoneSimulator.cpp 2014-06-04 10:20:20 +02:00
madmaxoft
c0015d01c6 Player permissions aren't logged to console anymore. 
This was only logspam on most servers and there are alternative ways to list players' permissions.
 2014-06-03 19:50:27 +02:00
JoannisO
7993caa553 - Fixed an issue where there were 2 "DispChunk"-s in the same function. 
Resused the initial one.
 2014-06-03 19:43:15 +02:00
JoannisO
c0716bfcf6 - Fixed a bug where I didn't return anything in the GetShootVector 
function. This was however passed as "working" by GCC.
 2014-06-03 19:39:56 +02:00
madmaxoft
492f99eaeb Merge remote-tracking branch 'howaner/Inventory' 2014-06-03 19:30:01 +02:00
madmaxoft
d92520016d Fixed OnProjectileHitBlock bindings. 
Also sorted the various cLuaState::Push() functions.
 2014-06-03 19:29:23 +02:00
Mattes D
0c5492946b Merge pull request #1028 from mc-server/pistonfixes 
Piston fixes
 2014-06-03 19:02:40 +02:00
JoannisO
2ecf425c39 - Fixed a bug where I used the FireCharge ITEM instead of the Projectile 
ENUM
 2014-06-03 18:19:06 +02:00
JoannisO
daae75b30b - Cleaned up the code massively 
- Stopped using cChunk in the GetShootVector class. Parameter is now the
Metadata of the block
- Stopped using cChunk in the SpawnProjectileFromDispenser method now
using coordinates and finding the chunk by itself.
- Removed the matrix calculations from GetShootVector.
 2014-06-03 17:21:38 +02:00
Joannis
545478802b - Added doxy comments and exported to lua 
- Manipulation of the ShootVector is not to be done by the function that
wants to spawn a projectile.
 2014-06-03 09:26:14 +02:00
Mattes D
60786cb06d Merge pull request #1052 from mc-server/UnderwaterBaseGen 
Underwater base gen
 2014-06-02 21:49:47 +02:00
Tiger Wang
5fc7592cba Merge remote-tracking branch 'origin/pistonfixes' 
Conflicts:
	src/Chunk.cpp
 2014-06-02 19:49:14 +01:00
STRWarrior
b9ca7bd120 Small tweak for mobs 
Mobs move a bit smoother and aren't able to move allot when in air.
 2014-06-02 14:16:36 +02:00
madmaxoft
b7dc4177d0 cBlockArea reading hotfix. 
This should fix the crashes introduced with chunksparsing. Not the most performant solution, but at least it should work.
Ref.: #1056
 2014-06-02 14:07:36 +02:00
madmaxoft
23b0823108 Update UnderwaterBase prefabs. 
Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights.
 2014-06-01 22:02:58 +02:00
Tiger Wang
a84f107400 Suggestions two 2014-06-01 20:00:11 +01:00
Mattes D
61edb83ce5 Merge pull request #844 from mc-server/ProjectileHitBlock 
OnProjectileHitBlock tweak.
 2014-06-01 20:10:03 +02:00
worktycho
750333855c abort does not take a parameter. 2014-06-01 17:23:02 +01:00
worktycho
476fdc9952 Use abort in SIGSEGV and SIGABRT handlers 
This should cause Mcserver to generate core dumps when it crashes.
 2014-06-01 17:05:51 +01:00
STRWarrior
319169eafb Made a_BlockHitPos a reference 2014-06-01 14:06:47 +02:00
madmaxoft
046c149797 Updated UnderwaterBase prefabs. 2014-06-01 10:07:57 +02:00
madmaxoft
75fe89b8ae Updated AlchemistVillage prefabs. 2014-06-01 09:27:54 +02:00
Howaner
12f3c0fcdf Players can't set items in the result slot, when they shift a item. 2014-06-01 00:50:35 +02:00
Howaner
a18b6c2311 Add HandleSmeltItem() call for achievements. 2014-06-01 00:43:09 +02:00
Howaner
5368e66486 Missing return; 2014-06-01 00:29:17 +02:00
madmaxoft
7672ca7eef Added an initial version of the underwater base generator. 2014-05-31 22:06:14 +02:00
Mattes D
6de45037c7 Merge pull request #1018 from mc-server/VillageGen 
Village gen
 2014-05-31 19:11:13 +02:00
JoannisO
b436359237 - Changed the name of the ProjectileLookVector method. 
Note: I still think the new name is unclear. Any other suggestions are
welcome.
 2014-05-31 16:08:15 +02:00
STRWarrior
d1b23060ad Used recommendations 2014-05-31 14:14:55 +02:00
Howaner
683da71c0f Moved the IsDoor check before the meta get. 2014-05-31 11:48:54 +02:00
Howaner
0b7ed0f493 Add doxy-comment 2014-05-31 11:47:03 +02:00
madmaxoft
600c93bdc1 Updated PlainsVillage prefabs. 2014-05-31 10:33:29 +02:00
madmaxoft
f4e9c88dcd Fixed a memory leak in VillagGen. 2014-05-31 10:33:12 +02:00
Mattes D
0b758946ac Merge pull request #951 from worktycho/chunksparsing/structs 
Chunksparsing with segments
 2014-05-31 10:12:54 +02:00
Howaner
2030800ad7 Set DraggingItem to Slot directly. 2014-05-31 00:27:24 +02:00
Howaner
d422aa4081 Fix DBL bug. 2014-05-31 00:25:20 +02:00
Howaner
01fc93857c Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0" 2014-05-31 00:22:24 +02:00
Howaner
843288493e Fix the furnace result slot. 2014-05-30 23:41:17 +02:00
madmaxoft
b9d306a801 Fixed bindings for cCompositeChat:SetMessageType(). 2014-05-30 22:42:00 +02:00
madmaxoft
8bf7aed67c Updated PlainsVillage and AlchemistVillage. 2014-05-30 22:40:19 +02:00
Howaner
92d9ab0f6d Wrong arrow commit. 2014-05-30 22:25:57 +02:00
Howaner
d8e16f8c1f Better SetOpen() and IsOpen() function from the doors. 2014-05-30 22:22:42 +02:00
Tycho
f26ddac619 removed NULL assignment to const value 2014-05-30 14:50:30 +01:00
Tycho
d854d3af1c removed unneded addressof 2014-05-30 14:43:33 +01:00
madmaxoft
e136f6e0f5 Fixed cChunkData nibble copying. 2014-05-30 11:35:29 +02:00
madmaxoft
730e36844e Test failures break into MSVC debugger. 2014-05-30 11:01:13 +02:00
madmaxoft
0b60caac4a Test failures are reported verbosely and into the debug console on Win. 2014-05-30 10:56:12 +02:00
madmaxoft
5368c5dd79 Fixed sign comparison. 2014-05-30 09:49:57 +02:00
madmaxoft
0e2138736c Fixed wrong copy sizes in cChunkData. 2014-05-30 09:17:17 +02:00
madmaxoft
8c4dd5dcfd Attempt at fixing an unresolved symbol in gcc / clang. 2014-05-29 21:41:44 +02:00
worktycho
be10f07db0 Fix bug when a_Idx is not a multiple of SectionBLockCount 2014-05-29 19:44:36 +01:00
worktycho
901e3ec494 Derp 2014-05-29 19:35:47 +01:00
worktycho
b50181e361 fix underflow 
Wish c++ could specify saturating unsigned underflow.
 2014-05-29 19:29:06 +01:00
madmaxoft
59068b77b7 Fixed wrong block sizes for copying / setting. 2014-05-29 20:21:39 +02:00
JoannisO
ab633c8bd6 - Prefixed all args with "a_" 
- Added braces around the cases.
 2014-05-29 20:19:36 +02:00
worktycho
0cfee5d141 Fixed Wrong types in nibble sizeofs 2014-05-29 19:10:35 +01:00
Howaner
b4ba220934 Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug. 2014-05-29 19:21:56 +02:00
worktycho
80fe19c0e2 Fixed overflow bug 2014-05-29 17:41:07 +01:00
madmaxoft
f7777e8c75 Added comments, reformatted code. 2014-05-29 18:25:08 +02:00
Tiger Wang
aa4477822a Suggestions 2014-05-29 16:03:41 +01:00
Tiger Wang
3549d0d5e6 More comments! 2014-05-29 15:59:39 +01:00
Tiger Wang
bacc873a17 Revert "Fixed a food saturation issue" 
This reverts commit 67308e4337.
 2014-05-29 12:12:10 +01:00
worktycho
d9c667d28f Add comment 2014-05-29 12:04:37 +01:00
Tiger Wang
365c6f50bd Changed block send queue to use vectors 
As suggested by @worktycho.
 2014-05-29 11:57:06 +01:00
Tiger Wang
ae4371a733 Fixed piston power checking 2014-05-29 11:56:22 +01:00
madmaxoft
e5187aa645 Fixed a memory leak in cPOCPieceGenerator 2014-05-29 09:19:20 +02:00
madmaxoft
b56033d541 Merge remote-tracking branch 'origin/master' into VillageGen 2014-05-29 09:14:47 +02:00
madmaxoft
999662503a Fixed forgotten changes. 2014-05-29 09:09:11 +02:00
madmaxoft
10273f64a2 Fixed a crash in message formatter. 
The code would fail if a message is sent to a player not yet added to a world.
 2014-05-28 22:41:23 +02:00
madmaxoft
81f756cbda cChunkData: Normalized code style. 2014-05-28 22:40:19 +02:00
Howaner
142fa83124 Code improvements 2014-05-28 19:32:20 +02:00
Howaner
9f645b2c75 Fix hay place sound. 2014-05-28 17:05:13 +02:00
Howaner
421588d25d Fix fire break. 2014-05-28 16:59:51 +02:00
Howaner
e7a7c45c36 Add throw sound and fix arrow server crash. 2014-05-28 16:39:59 +02:00
madmaxoft
7ec44951a0 Fixed cChunkData formatting. 2014-05-28 16:34:25 +02:00
madmaxoft
d29b242674 Fixed a memory leak in cPrefabPiecePool. 
The pool pieces weren't freed upon pool destruction.
 2014-05-28 16:33:10 +02:00
Howaner
d4f90259b8 Fix Y-Position from arrow entity. 2014-05-28 16:12:10 +02:00
Howaner
61b6fdde75 Fix right click bugs. 2014-05-28 16:07:51 +02:00
Howaner
d8072da61f Fix skull bugs. 2014-05-28 15:54:43 +02:00
JoannisO
427bddc189 - Removed breaks. I thought it wouldn't compile without them but the 
issue was appearantly solved with an earlier commit.
 2014-05-28 15:16:45 +02:00
JoannisO
4bc02781af - Fixed an issue where dispensers would only shoot arrows (appearantly 
some commits didn't come through)
- Cleaned up the code according to suggestions.
 2014-05-28 14:34:33 +02:00
Joannis
e5fd782524 - Implemented vertical dispensing for projectiles. 
- Fixed some terrible commit issues on my side.
 2014-05-28 09:10:09 +02:00
madmaxoft
dff71823d4 Merge branch 'master' into VillageGen 2014-05-27 22:09:30 +02:00
madmaxoft
6b41d1a422 Added AlchemistVillage prefabs (Thanks, KingsCraftAu). 2014-05-27 22:08:20 +02:00
madmaxoft
71256c98ed Fixed testing weights in PlainsVillages. 2014-05-27 22:06:49 +02:00
madmaxoft
ff99373237 cPieceGenerator chooses starting pieces based on weights. 
Fixes #1033.
 2014-05-27 22:05:50 +02:00
madmaxoft
6c25c356c7 Biome generators: biome lists can contain spaces. 2014-05-27 21:18:15 +02:00
Tycho
19df18c461 Fixed test globals to work with precompiled headers 2014-05-27 12:46:22 +01:00
Joannis
1128dc783f - Fixed the ampersands and asterisks to fit the format. 
- Fixed the method "SpawnProjectileFromDispenser" to use CamelCasing.
 2014-05-27 11:08:06 +02:00
archshift
c204735f38 ClientHandle.cpp: Process look before pos 2014-05-27 00:28:46 -07:00
archshift
0a3570bc9d ClientHandle.cpp: remove redundant code 
HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy.
 2014-05-26 14:15:32 -07:00
madmaxoft
6449b5d11b Revert "Add more move checks" 
This reverts commit 989312c4e7.
 2014-05-26 16:38:39 +02:00
JoannisO
74801f5647 - Added support for more types of projectiles in the Dispenser 
- Improved the method of spawning projectiles in the world
- Added another method for spawning the projectiles
 2014-05-26 14:47:04 +02:00
Mattes D
6ad411a8b8 Merge pull request #1003 from Howaner/GlobalFixes 
Add more move checks
 2014-05-26 10:14:05 +02:00
madmaxoft
24137e282b Fixed prefab test initialization. 2014-05-26 10:05:51 +02:00
JoannisO
c9c2a4f479 Added Arrow- and FireCharge-Dispensing to DispenserEntity. 2014-05-26 08:44:16 +02:00
madmaxoft
1a742a2b52 Added support for Miners' Village. 
The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors.
Fixes #1027.
 2014-05-25 23:50:16 +02:00
Alexander Harkness
a352ec3895 SEMICOLONS! 2014-05-25 19:46:16 +01:00
worktycho
6ce73ada6f Update GroupManager.h 2014-05-25 19:17:01 +01:00
Alexander Harkness
50e29aba77 A fix that is better than #950. 2014-05-25 18:32:42 +01:00
Tiger Wang
67308e4337 Fixed a food saturation issue 2014-05-25 13:46:50 +01:00
Tiger Wang
ee929793f0 Hopefully fixed piston duplication issues 
* Fixes #879
* Fixes #714
 2014-05-25 13:46:34 +01:00
Tiger Wang
f55f5ec47f Merge branch 'master' into achievementtranslate 
Conflicts:
	src/Entities/Player.cpp
 2014-05-24 23:21:39 +01:00
Tycho
944d29c0ae inject TestGlobals.h correctly 2014-05-24 14:09:51 +01:00
madmaxoft
96a22cd82c Added Japanese village prefabs. 2014-05-24 15:03:39 +02:00
Tycho
7fac63cffb Moved accessors to cpp file 2014-05-24 13:37:25 +01:00
Tycho
8f964886e0 Implemented style changes 2014-05-24 13:33:40 +01:00
Tycho
4ab8288116 Merge branch 'master' into chunksparsing/structs 2014-05-24 12:44:49 +01:00
Mattes D
97865bff7c Fixed Mineshaft system size. 2014-05-23 13:01:50 +02:00
Mattes D
a4c964c888 Auto-enlargement for cGridStructGen cache. 2014-05-23 13:01:06 +02:00
Mattes D
941cb88ae4 Fixed datatype conversion warning. 2014-05-23 12:33:30 +02:00
Mattes D
64dbc45a00 Merge branch 'master' into VillageGen 
* master:
  Fixed profiling flags for MSVC.
  Fixed cWither::KilledBy
  Cleaned up cPlayer::UpdateMovementStats; Wither achievements
  Fixed MCADefrag compilation.
  Derp
  Should have fixed assumptions about entity width.
  Fixed clanging errors.
  Implemented cacti damage
 2014-05-23 11:25:42 +02:00
madmaxoft
da843a1881 Updated plains village prefabs. 
Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects.
 2014-05-22 22:19:44 +02:00
madmaxoft
6aa7df367f Villages have min and max density setting. 
Also made roads use 3+9 scheme, instead of 3+5, for the house connectors.

Fixes #1020.
 2014-05-22 21:47:56 +02:00
STRWarrior
5e90976cd9 Added doxy-comments 2014-05-22 17:10:35 +02:00
STRWarrior
592a0b6147 cEntity::SetSpeed(a_Vector3d) isn't virtualized anymore 2014-05-22 11:46:38 +02:00
STRWarrior
73455d2938 cPlayer overrides the SetSpeedXX functions 
Fixed compile error
 2014-05-22 11:08:44 +02:00
STRWarrior
5ef6c8fe72 Both SetSpeed functions are now overridden by cPlayer 2014-05-22 10:54:07 +02:00
madmaxoft
ebb1ef237a Updated plains village prefabs. 
The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes.
 2014-05-22 08:57:57 +02:00
madmaxoft
85fc0dbd97 Changed desert village roads to gravel. 2014-05-21 23:17:09 +02:00
madmaxoft
efcae77828 Added second kind of desert village (FlatRoof). 2014-05-21 23:16:43 +02:00
Tycho
4b23472097 Fixed if spaces 2014-05-21 21:46:20 +01:00
Tycho
88c61a2e96 Fixed reversed comparisons to null 2014-05-21 21:18:14 +01:00
Tycho
93c0dcb1fe Added space to ChunkData.cpp 2014-05-21 20:26:43 +01:00
Tycho
bd880603a5 Changed cChunkData::SetMeta to return a bool indicating whether the value changed 2014-05-21 20:18:09 +01:00
Tycho
5929ffbc40 Fixed stylistic issues 2014-05-21 20:08:34 +01:00
Tycho
024027db89 Renamed cChunkBuffer to cChunkData 2014-05-21 19:58:48 +01:00
Tycho
cdd3d11496 Fixed minor style issues 2014-05-21 18:33:54 +01:00
xdot
671c73c639 Merge pull request #1015 from mc-server/Stats 
Statistics
 2014-05-21 11:14:44 +03:00
andrew
7aeb8ce993 Fixed cWither::KilledBy 2014-05-21 10:59:14 +03:00
Tiger Wang
576e17ae08 Update CompositeChat.h 2014-05-20 22:49:21 +01:00
andrew
07baf9bdd3 Cleaned up cPlayer::UpdateMovementStats; Wither achievements 2014-05-20 15:52:59 +03:00
Alexander Harkness
507df71845 Update Player.cpp 2014-05-20 13:35:39 +01:00
Tiger Wang
2bfe962e28 Fixed a cactus Y position issue 2014-05-19 22:15:39 +01:00
Tiger Wang
4008af6925 Simplified cacti conditions 2014-05-19 21:17:28 +01:00
Tiger Wang
3a9543178a cCompositeChat message type is now formatted 2014-05-19 21:16:29 +01:00
Tiger Wang
42c36429d7 Added client translation to achievements 2014-05-19 20:40:56 +01:00
Julian Laubstein
7e2effb2d8 Changed the m_slotarea position 2014-05-19 15:46:36 +02:00
Alexander Harkness
1de4408a18 Merge pull request #1010 from mc-server/cactidamage 
Implemented cacti damage
 2014-05-19 14:01:50 +01:00
Julian Laubstein
6687848a7e Fixed warnings in IncrementalRedstoneSimulator 2014-05-19 14:49:18 +02:00
Julian Laubstein
fb7f2993bf Fixed some warnings in Server.cpp, and in UI/ 2014-05-19 14:34:34 +02:00
Alexander Harkness
6de0257bbe Derp 2014-05-19 13:31:19 +01:00
Julian Laubstein
e9abf9a498 Rolled some changes back 2014-05-19 13:02:02 +02:00
Alexander Harkness
dc39d88d3f Should have fixed assumptions about entity width. 
@madmaxoft can you comment?
 2014-05-19 10:35:21 +01:00
Julian Laubstein
cfbb256360 Fixed some warnings 2014-05-19 10:37:43 +02:00
Alexander Harkness
70cf4a5eaf Fixed clanging errors. 
Please @tigerw make sure this is correct.
 2014-05-19 07:31:53 +01:00
Tiger Wang
6167c79e7a Implemented cacti damage 
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
 2014-05-18 22:41:42 +01:00
madmaxoft
e69a11012f Merged branch 'master' into VillageGen. 2014-05-18 23:10:23 +02:00
madmaxoft
ec50c0f9e1 Updated SandVillage prefabs to latest Gallery content. 
This fixes sand village generation.
 2014-05-18 23:09:39 +02:00
madmaxoft
a651c865e4 There's no "round" function in MSVC2008. 2014-05-18 22:49:27 +02:00
madmaxoft
e09a04a23a Fixed datatype truncation in Diff() template. 2014-05-18 22:36:31 +02:00
Mattes D
ac00568183 Merge pull request #998 from mc-server/StatManager 
Statistic Manager
 2014-05-18 22:30:34 +02:00
Julian Laubstein
40ce737a7e removed the <list> include 2014-05-18 17:30:21 +02:00
Julian Laubstein
cfd3c33dfa Added unload <pluginname> command 2014-05-18 17:16:02 +02:00
Tycho
8a0d3f7921 Fixed issue with types not being defined for an unused parameter 2014-05-18 15:37:17 +01:00
madmaxoft
a7e52e51dc Village roads are drawn properly. 2014-05-17 22:26:09 +02:00
madmaxoft
7004043c61 Village houses are height-adjusted onto the terrain. 2014-05-17 21:54:04 +02:00
Julian Laubstein
19f4cd0547 Added load cmd 2014-05-17 19:39:16 +02:00
Julian Laubstein
6951b68aaf Added load command in the cServer class 2014-05-17 18:38:33 +02:00
Tycho
f451075c1f derp 2014-05-17 15:32:28 +01:00
Tycho
1f98f21dd1 fixed assignment bugs and Skylight bug 2014-05-17 15:11:58 +01:00
worktycho
4e841146b8 Fix assignment ops 2 2014-05-17 14:29:15 +01:00
worktycho
7777da379d Fix assignment operators 2014-05-17 14:04:44 +01:00
madmaxoft
fc5c3abcba Updated PlainsVillage prefabs to the latest Gallery contents. 2014-05-17 02:26:44 +02:00
Howaner
989312c4e7 Add more move checks 
- Invalid X/Y/Z/Stance check (std::isnan)
- Illegal stance
- Illegal position (32.000.000 is the world size)
 2014-05-16 22:04:19 +02:00
tonibm19
5724dcc2c1 Fixed anvil exp removing 2014-05-16 19:33:57 +02:00
Mattes D
0e43f88668 Merge pull request #994 from Howaner/GlobalFixes 
Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
 2014-05-15 21:16:04 +02:00
Howaner
28a9c16db2 Fix compile error. 2014-05-15 19:59:52 +02:00
Howaner
6c5ff597bb Move radius check. 2014-05-15 19:58:48 +02:00
madmaxoft
70b0547499 Fixed a NULL ptr failure in GridStructGen. 
When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead.
 2014-05-15 16:03:45 +02:00
madmaxoft
56f7ad2cd9 Changed village generator defaults to more reasonable values. 2014-05-15 10:44:08 +02:00
madmaxoft
34e5f0c164 Changed village road generation to use multiple prefabs. 2014-05-15 10:43:54 +02:00
madmaxoft
f5fdbdaf29 VillageGen rewritten using BFSPieceGenerator. 
Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
 2014-05-15 00:14:06 +02:00
madmaxoft
3660ce6834 cPrefab can be constructed in code. 2014-05-15 00:12:01 +02:00
andrew
466ff2204f Fixes 2014-05-13 14:53:15 +03:00
madmaxoft
9c8e8ef7ae VillageGen: Added well placement and the general algorithm description. 2014-05-12 22:43:59 +02:00
andrew
aea866f5b1 Movement Statistics 2014-05-12 21:38:52 +03:00
andrew
b3d2b5b2c9 cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() 2014-05-12 17:05:09 +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
madmaxoft
c0727c4265 Initial VillageGen implementation. 
WIP, doesn't generate anything yet.
Ref.: 740.
 2014-05-11 22:35:41 +02:00
andrew
6cb3483954 Fixed compilation 2014-05-11 21:41:25 +03:00
Tycho
c46f240d81 Added several more testsfor arrays and coordinates 2014-05-11 19:24:09 +01:00
Tycho
5d39ecc64b Fixed bug that caused Array Setters to always create segments 2014-05-11 18:42:38 +01:00
andrew
e3c6c8f3dd Fixed stat serialization 2014-05-11 20:30:54 +03:00
Tycho
9568c223ff SkyLight defaults to 0xFF 2014-05-11 18:24:21 +01:00
Tycho
9278bb732d Fixed a bug in writting zeros to a non-allocated section 2014-05-11 15:52:02 +01:00
andrew
c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Howaner
5c9f89526a Rename HandleBlockDigCancel to FinishDigAnimtion. 2014-05-11 11:56:15 +02:00
Mattes D
28815252e6 Merge branch 'master' into SslWebAdmin 2014-05-10 21:27:57 +02:00
Mattes D
7e71f1f7dc Merge pull request #993 from mc-server/GridStructGen 
Grid struct gen
 2014-05-10 21:21:44 +02:00
Tycho
7ca33bd832 Fixed stupid error 2014-05-10 17:56:59 +01:00
Tycho
43fc1471a1 Merge branch 'master' into chunksparsing/structs 2014-05-10 17:55:43 +01:00
Tycho
0adb5c94b8 Fixed stupid buffer overflow in array setblocks 2014-05-10 17:46:49 +01:00
STRWarrior
079f8cd535 Fixed the console saying no plugins are loaded. 2014-05-10 17:55:39 +02:00
STRWarrior
4ca178f24a Fixed compile problem. 2014-05-10 17:09:48 +02:00
STRWarrior
7f3683cfab A portal block now chooses a number between 2000 and 0 2014-05-10 17:03:02 +02:00
STRWarrior
3b1f11bd6a Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman. 2014-05-10 16:43:06 +02:00
Tycho
cb6200345c Fixed bug in setting metas 2014-05-10 15:19:06 +01:00
Tycho
d478e3cfb1 Merge branch 'master' into chunksparsing/structs 
Conflicts:
	src/Chunk.h
 2014-05-10 05:05:44 -07:00
Mattes D
683b839e2b Client cert is not requested. 2014-05-10 09:21:29 +02:00
Howaner
eb0f713b6a Add block place/break distance check. 2014-05-09 23:43:00 +02:00
Howaner
c8631d9a9b Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. 2014-05-09 23:10:02 +02: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
839cff62ad Merged branch 'master' into GridStructGen. 2014-05-09 20:59:59 +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
a936736acd Removed unused constants from MineShafts and Ravines. 2014-05-09 20:13:20 +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
0fc60edaeb Removed an unused NetherFortGen variable. 2014-05-09 19:53:57 +02:00
Mattes D
b997fbaf45 Removed an unused macro. 2014-05-09 19:35:35 +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
dd350bc1f3 World pre-generation distance is settable in world.ini. 2014-05-09 18:32:04 +02:00
Mattes D
56ad2c2124 Lighting thread disabled its chunkstays before deleting them. 2014-05-09 18:32:03 +02: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
ea593dcaad Ravines rewritten using cGridStructGen. 
Ref.: #987.
 2014-05-09 18:30:39 +02:00
worktycho
17c7c31130 Initialise m_HasTeleported in both constructors 2014-05-09 16:56:29 +01:00
Mattes D
95ead1128f cWormNestCaves rewritten using cGridStructGen. 
Ref.: #987.
 2014-05-09 11:16:13 +02:00
Mattes D
14543aa3fc Mineshafts generator rewritten to use GridStructGen. 2014-05-09 10:59:33 +02:00
Mattes D
ee680990ba Fixed cGridStructGen. 
Now cNetherFortGen works with the new architecture.
 2014-05-08 21:10:55 +02:00
Mattes D
ccf44f18d1 Merge branch 'master' into GridStructGen 2014-05-08 20:17:31 +02:00
Mattes D
c4ea25e136 Fixed MSVC 64-bit build warnings. 2014-05-08 20:16:35 +02:00
madmaxoft
564261cfd9 cNetherFortGen uses cGridStructGen. 
WIP, this doesn't work properly yet.
 2014-05-07 22:34:06 +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
Mattes D
d9cdd4441e Merge pull request #853 from Howaner/Slabs 
Grass now grows under up-side-down slabs
 2014-05-07 22:18:23 +02:00
Howaner
c96a27f4ae Superfluous method override. 2014-05-07 21:36:26 +02:00
Howaner
df71cc931b Missing comma 2014-05-07 21:32:52 +02:00
Howaner
10e3c262db Send item back to the client when the item get damage. 2014-05-07 21:00:21 +02:00