Commit Graph

2815 Commits

Author SHA1 Message Date
Thinkofdeath
e6809b3b9b Remove quotes from version hash by updating the gitdescribe version 2014-12-05 21:33:57 +00:00
Thinkofdeath
91ee2c2365 Merge pull request #30 in SPIGOT/craftbukkit from ~ZREED/craftbukkit:master to master
* commit '9e04f2f765194c087b52c3707a482ed9d5e56c8d':
  Use PlayerList's UUID->EntityPlayer map in CraftServer.getPlayer(UUID)
2014-12-05 18:22:38 +01:00
Thinkofdeath
0d4fba2c14 SPIGOT-117: Fix sticky pistons firing for the wrong direction when pulling blocks backwards 2014-12-05 15:11:22 +00:00
Thinkofdeath
3f6a1db4f6 SPIGOT-123: Force inventory updates on crafting to correctly support custom recipes 2014-12-05 15:04:01 +00:00
Thinkofdeath
bab0e8bc70 Fix the chunks being blocked from unloading based on the keepSpawnInMemory flag 2014-12-05 11:17:47 +00:00
zreed
9e04f2f765 Use PlayerList's UUID->EntityPlayer map in CraftServer.getPlayer(UUID) 2014-12-05 02:03:49 -05:00
Thinkofdeath
e2c4f20ed1 Serialize baseColor as a string 2014-12-04 10:10:24 +00:00
Aikar
8a8312fb92 Improve patch scripts, add applyPatches.sh
When working on CraftBukkit, one may need to update to the latest.
Before adding new work, you would need to rebuild your patched files to latest.
Currently BuildTools does this for you, but BuildTools does not support segment based actions.

So this new script replicates the behavior of rebuilding the patched files using nms-patches.

BuildTools can then be updated to simply call this script.

Also, improved makePatches by removing dos2unix. This command does not exists on all systems,
and can very simply be replaced by sed.

Finally, hard coded path to /ls as a user may of aliased ls to default change the format, so
call it directly to ensure we get the desired behavior.
2014-12-03 14:46:14 -05:00
Thinkofdeath
2ba7357b4a Merge pull request #27 in SPIGOT/craftbukkit from ~AIKAR/craftbukkit:fixWorldSaveEvent to master
* commit '64492523a761fb37d2b73f4aad8b8041f7a30d83':
  Move WorldSaveEvent to proper location
2014-12-03 20:37:32 +01:00
Aikar
64492523a7 Move WorldSaveEvent to proper location
calling CraftWorld.save() currently does not call WorldSaveEvent, and WorldSaveEvent could fire on worlds that have saving disabled.

New location will always fire during a world save and only during an actual save.
2014-12-03 14:35:33 -05:00
Thinkofdeath
200ae2b6ac Fix a issue with skulls that have a blank owner 2014-12-03 19:04:19 +00:00
Thinkofdeath
4c02ffcaf3 Merge pull request #5 in SPIGOT/craftbukkit from ~DMCK2B/craftbukkit:feature/implementDepthStrider to master
* commit 'cce45591f624c915e87ce132b508adf8e0d7961b':
  Implement the Depth Strider enchantment for the API
2014-12-03 17:41:27 +01:00
Fabian Faßbender
497a7b4cfb Add ANVIL and BEACON custom inventories. Also handle a few special cases for inventory sizes 2014-12-03 16:20:55 +00:00
Thinkofdeath
8110f51b50 Minor formatting fixes 2014-12-03 11:08:35 +00:00
Thinkofdeath
df0b4c1ca4 Fix spawn reason for mob eggs 2014-12-03 10:52:18 +00:00
Thinkofdeath
a972ddfc74 Missed a case 2014-12-02 23:57:29 +00:00
Thinkofdeath
1613d09138 Don't wrap the y coordinate in World.getBlockAt 2014-12-02 23:54:38 +00:00
Thinkofdeath
37102a0c16 SPIGOT-102: Fix the player being teleported up 1.62 blocks on cancelling the PlayerMoveEvent 2014-12-02 20:39:30 +00:00
Thinkofdeath
2422099346 Fix selectors in non-bukkit commands for command blocks 2014-12-02 20:24:03 +00:00
Thinkofdeath
3c4a02ed33 Filter invalid bounding boxes for entities
This should prevent issues caused by broken horses
2014-12-02 17:53:34 +00:00
Thinkofdeath
0429c76df6 Fix a missed case for weather transitions on join 2014-12-02 16:38:16 +00:00
Thinkofdeath
2b61a04e36 Merge pull request #22 in SPIGOT/craftbukkit from ~FEARTHE1337/craftbukkit:fixCraftMetaBanner to master
* commit '351edbf4e5dc679dfe65258c6919e9a2a75f7ae8':
  Fix CraftMetaBanner serialization.
2014-12-02 16:47:25 +01:00
Thinkofdeath
b6cff41473 SPIGOT-96/BUKKIT-5016: Fix thunder storms not darkening the sky and transitions being broken. 2014-12-02 15:14:17 +00:00
BuildTools
351edbf4e5 Fix CraftMetaBanner serialization. 2014-12-02 15:29:04 +01:00
Thinkofdeath
275603d37a Merge pull request #21 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/SPIGOT-93 to master
* commit '7371301edb1c44ab9153e1fba3722ba2f4e3c411':
  Forgot that i work in Bukkit... Screw sun conventions
  Implementation for the new rotation values. Fixes SPIGOT-93
2014-12-02 13:23:46 +01:00
Thinkofdeath
733e4290d8 [Slightly breaking] setType(Id) will not longer reuse the previous data value
of the block and instead reset the the data value to the block's default
2014-12-02 12:03:02 +00:00
Thinkofdeath
b58808d54d Fix tree related crashes due to lazy BlockState updating 2014-12-02 11:51:49 +00:00
Fabian Faßbender
7371301edb Forgot that i work in Bukkit... Screw sun conventions 2014-12-02 00:20:31 +01:00
Fabian Faßbender
0d5693dec5 Implementation for the new rotation values. Fixes SPIGOT-93 2014-12-02 00:13:25 +01:00
Thinkofdeath
d2c2630307 SPIGOT-85: Fix NPE in monster spawners when right-clicked with invalid spawn eggs 2014-12-01 10:08:17 +00:00
Thinkofdeath
1af2540f78 Merge pull request #16 in SPIGOT/craftbukkit from ~AET2505/craftbukkit:fix/ShowPlayer to master
* commit 'cc9b479fe6379aa95d4da05e96131c77df3e650d':
  Fix show player
2014-12-01 00:02:43 +02:00
Adam Thomas
cc9b479fe6 Fix show player 2014-11-30 20:12:54 +00:00
Thinkofdeath
cd65011eac Merge pull request #15 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/oob-horses to master
* commit 'ebec73b5a952f9b75465c6165d314f00c199eb94':
  Another attempt of fixing OOB Horses. Just remove them from the world instead of setting it dead.
2014-11-30 21:23:01 +02:00
Fabian Faßbender
ebec73b5a9 Another attempt of fixing OOB Horses. Just remove them from the world instead of setting it dead. 2014-11-30 19:02:56 +01:00
Thinkofdeath
cab7c772df Add missing CB comment 2014-11-30 16:35:44 +00:00
Thinkofdeath
c81db390ac Force chunk loading in EntityHuman.getBed, Fixes SPIGOT-64 2014-11-30 16:33:45 +00:00
Thinkofdeath
8b94fad772 Merge pull request #13 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/SPIGOT-20 to master
* commit 'cc0d8bb32722bce9ea87b60c8353f070eb51aa7d':
  Update the correct Scoreboard Criteria when a health change comes in. This fixes SPIGOT-20
2014-11-30 17:10:32 +02:00
Thinkofdeath
22df292258 Add a somewhat hacky fix for plugins converting between book types 2014-11-30 15:06:14 +00:00
Fabian Faßbender
cc0d8bb327 Update the correct Scoreboard Criteria when a health change comes in. This fixes SPIGOT-20 2014-11-30 13:34:38 +01:00
Thinkofdeath
6eb0c79271 Fix Chunk.getTileEntities() (Fixes SPIGOT-62) 2014-11-30 12:15:56 +00:00
Thinkofdeath
7c0f352486 Fix LEFT_CLICK_AIR 2014-11-30 12:10:30 +00:00
Thinkofdeath
c8adfecee3 Add a flag to correctly convert signs to 1.8 2014-11-30 11:23:45 +00:00
Thinkofdeath
20207a0124 Correct the return value of getPlayerListName 2014-11-30 10:30:32 +00:00
Thinkofdeath
73f4bc3434 Merge pull request #10 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/SPIGOT-58 to master
* commit 'c8a76994dcad959b306d6e84e0b73f23571f3e14':
  Horses spawned under Y 0 cause CraftBukkit to crash. This happens a lot since people keep using bugged Horses for Holographics
2014-11-30 02:05:29 +02:00
Fabian Faßbender
c8a76994dc Horses spawned under Y 0 cause CraftBukkit to crash. This happens a lot since people keep using bugged Horses for Holographics
Remove out of bounds horses, fixes an vanilla bug. Fixes SPIGOT-58
2014-11-30 01:03:59 +01:00
Thinkofdeath
cef65526d4 Optimize the invalid block fixing 2014-11-29 23:25:17 +00:00
Thinkofdeath
0f552845d0 Treat LeavesDecayEvent as canceled if a plugin changes the block 2014-11-29 22:31:55 +00:00
Thinkofdeath
9255e9d82c Fix canceling BlockPlaceEvent 2014-11-29 21:17:57 +00:00
Thinkofdeath
bf401fbbde Remove old debug info 2014-11-29 21:09:04 +00:00
Thinkofdeath
89f59f9e4d Merge pull request #8 in SPIGOT/craftbukkit from ~GENAZT/craftbukkit:bugfix/SPIGOT-46 to master
* commit '1e8a3f192f78aebad26c3ed9dcdd27d61d51e130':
  Corrected WorldData patch file
  Rewrite the level.dat properly. This fixes SPIGOT-46
2014-11-29 22:14:27 +02:00