Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-01 14:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into release

Browse Source
This commit is contained in:
snowleo 2011-11-17 16:34:39 +01:00
commit adcffba7cf
2 changed files with 97 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
Essentials/src/items.csv
View File

@ -360,100 +360,100 @@ wtree,17,2
wlog,17,2 wlog,17,2
wtrunk,17,2 wtrunk,17,2
wwood,17,2 wwood,17,2
leaves,18,0 leaves,18,4
leaf,18,0 leaf,18,4
treeleaves,18,0 treeleaves,18,4
logleaves,18,0 logleaves,18,4
trunkleaves,18,0 trunkleaves,18,4
woodleaves,18,0 woodleaves,18,4
oaktreeleaves,18,0 oaktreeleaves,18,4
oaklogleaves,18,0 oaklogleaves,18,4
oaktrunkleaves,18,0 oaktrunkleaves,18,4
oakwoodleaves,18,0 oakwoodleaves,18,4
normaltreeleaves,18,0 normaltreeleaves,18,4
normallogleaves,18,0 normallogleaves,18,4
normaltrunkleaves,18,0 normaltrunkleaves,18,4
normalwoodleaves,18,0 normalwoodleaves,18,4
otreeleaves,18,0 otreeleaves,18,4
ologleaves,18,0 ologleaves,18,4
otrunkleaves,18,0 otrunkleaves,18,4
owoodleaves,18,0 owoodleaves,18,4
ntreeleaves,18,0 ntreeleaves,18,4
nlogleaves,18,0 nlogleaves,18,4
ntrunkleaves,18,0 ntrunkleaves,18,4
nwoodleaves,18,0 nwoodleaves,18,4
treeleaf,18,0 treeleaf,18,4
logleaf,18,0 logleaf,18,4
trunkleaf,18,0 trunkleaf,18,4
woodleaf,18,0 woodleaf,18,4
oaktreeleaf,18,0 oaktreeleaf,18,4
oaklogleaf,18,0 oaklogleaf,18,4
oaktrunkleaf,18,0 oaktrunkleaf,18,4
oakwoodleaf,18,0 oakwoodleaf,18,4
normaltreeleaf,18,0 normaltreeleaf,18,4
normallogleaf,18,0 normallogleaf,18,4
normaltrunkleaf,18,0 normaltrunkleaf,18,4
normalwoodleaf,18,0 normalwoodleaf,18,4
otreeleaf,18,0 otreeleaf,18,4
ologleaf,18,0 ologleaf,18,4
otrunkleaf,18,0 otrunkleaf,18,4
owoodleaf,18,0 owoodleaf,18,4
ntreeleaf,18,0 ntreeleaf,18,4
nlogleaf,18,0 nlogleaf,18,4
ntrunkleaf,18,0 ntrunkleaf,18,4
nwoodleaf,18,0 nwoodleaf,18,4
pineleaves,18,1 pineleaves,18,5
pineleaf,18,1 pineleaf,18,5
pinetreeleaves,18,1 pinetreeleaves,18,5
pinelogleaves,18,1 pinelogleaves,18,5
pinetrunkleaves,18,1 pinetrunkleaves,18,5
pinewoodleaves,18,1 pinewoodleaves,18,5
ptreeleaves,18,1 ptreeleaves,18,5
plogleaves,18,1 plogleaves,18,5
ptrunkleaves,18,1 ptrunkleaves,18,5
pwoodleaves,18,1 pwoodleaves,18,5
pitreeleaves,18,1 pitreeleaves,18,5
pilogleaves,18,1 pilogleaves,18,5
pitrunkleaves,18,1 pitrunkleaves,18,5
piwoodleaves,18,1 piwoodleaves,18,5
pinetreeleaf,18,1 pinetreeleaf,18,5
pinelogleaf,18,1 pinelogleaf,18,5
pinetrunkleaf,18,1 pinetrunkleaf,18,5
pinewoodleaf,18,1 pinewoodleaf,18,5
ptreeleaf,18,1 ptreeleaf,18,5
plogleaf,18,1 plogleaf,18,5
ptrunkleaf,18,1 ptrunkleaf,18,5
pwoodleaf,18,1 pwoodleaf,18,5
pitreeleaf,18,1 pitreeleaf,18,5
pilogleaf,18,1 pilogleaf,18,5
pitrunkleaf,18,1 pitrunkleaf,18,5
piwoodleaf,18,1 piwoodleaf,18,5
birchleaves,18,2 birchleaves,18,6
birchleaf,18,2 birchleaf,18,6
birchtreeleaves,18,2 birchtreeleaves,18,6
birchlogleaves,18,2 birchlogleaves,18,6
birchtrunkleaves,18,2 birchtrunkleaves,18,6
birchwoodleaves,18,2 birchwoodleaves,18,6
btreeleaves,18,2 btreeleaves,18,6
blogleaves,18,2 blogleaves,18,6
btrunkleaves,18,2 btrunkleaves,18,6
bwoodleaves,18,2 bwoodleaves,18,6
bitreeleaves,18,2 bitreeleaves,18,6
bilogleaves,18,2 bilogleaves,18,6
bitrunkleaves,18,2 bitrunkleaves,18,6
biwoodleaves,18,2 biwoodleaves,18,6
birchtreeleaf,18,2 birchtreeleaf,18,6
birchlogleaf,18,2 birchlogleaf,18,6
birchtrunkleaf,18,2 birchtrunkleaf,18,6
birchwoodleaf,18,2 birchwoodleaf,18,6
btreeleaf,18,2 btreeleaf,18,6
blogleaf,18,2 blogleaf,18,6
btrunkleaf,18,2 btrunkleaf,18,6
bwoodleaf,18,2 bwoodleaf,18,6
bitreeleaf,18,2 bitreeleaf,18,6
bilogleaf,18,2 bilogleaf,18,6
bitrunkleaf,18,2 bitrunkleaf,18,6
biwoodleaf,18,2 biwoodleaf,18,6
sponge,19,0 sponge,19,0
glass,20,0 glass,20,0
lapislazuliore,21,0 lapislazuliore,21,0

1 #version: TeamCity
360 wlog,17,2
361 wtrunk,17,2
362 wwood,17,2
363 leaves,18,0 leaves,18,4
364 leaf,18,0 leaf,18,4
365 treeleaves,18,0 treeleaves,18,4
366 logleaves,18,0 logleaves,18,4
367 trunkleaves,18,0 trunkleaves,18,4
368 woodleaves,18,0 woodleaves,18,4
369 oaktreeleaves,18,0 oaktreeleaves,18,4
370 oaklogleaves,18,0 oaklogleaves,18,4
371 oaktrunkleaves,18,0 oaktrunkleaves,18,4
372 oakwoodleaves,18,0 oakwoodleaves,18,4
373 normaltreeleaves,18,0 normaltreeleaves,18,4
374 normallogleaves,18,0 normallogleaves,18,4
375 normaltrunkleaves,18,0 normaltrunkleaves,18,4
376 normalwoodleaves,18,0 normalwoodleaves,18,4
377 otreeleaves,18,0 otreeleaves,18,4
378 ologleaves,18,0 ologleaves,18,4
379 otrunkleaves,18,0 otrunkleaves,18,4
380 owoodleaves,18,0 owoodleaves,18,4
381 ntreeleaves,18,0 ntreeleaves,18,4
382 nlogleaves,18,0 nlogleaves,18,4
383 ntrunkleaves,18,0 ntrunkleaves,18,4
384 nwoodleaves,18,0 nwoodleaves,18,4
385 treeleaf,18,0 treeleaf,18,4
386 logleaf,18,0 logleaf,18,4
387 trunkleaf,18,0 trunkleaf,18,4
388 woodleaf,18,0 woodleaf,18,4
389 oaktreeleaf,18,0 oaktreeleaf,18,4
390 oaklogleaf,18,0 oaklogleaf,18,4
391 oaktrunkleaf,18,0 oaktrunkleaf,18,4
392 oakwoodleaf,18,0 oakwoodleaf,18,4
393 normaltreeleaf,18,0 normaltreeleaf,18,4
394 normallogleaf,18,0 normallogleaf,18,4
395 normaltrunkleaf,18,0 normaltrunkleaf,18,4
396 normalwoodleaf,18,0 normalwoodleaf,18,4
397 otreeleaf,18,0 otreeleaf,18,4
398 ologleaf,18,0 ologleaf,18,4
399 otrunkleaf,18,0 otrunkleaf,18,4
400 owoodleaf,18,0 owoodleaf,18,4
401 ntreeleaf,18,0 ntreeleaf,18,4
402 nlogleaf,18,0 nlogleaf,18,4
403 ntrunkleaf,18,0 ntrunkleaf,18,4
404 nwoodleaf,18,0 nwoodleaf,18,4
405 pineleaves,18,1 pineleaves,18,5
406 pineleaf,18,1 pineleaf,18,5
407 pinetreeleaves,18,1 pinetreeleaves,18,5
408 pinelogleaves,18,1 pinelogleaves,18,5
409 pinetrunkleaves,18,1 pinetrunkleaves,18,5
410 pinewoodleaves,18,1 pinewoodleaves,18,5
411 ptreeleaves,18,1 ptreeleaves,18,5
412 plogleaves,18,1 plogleaves,18,5
413 ptrunkleaves,18,1 ptrunkleaves,18,5
414 pwoodleaves,18,1 pwoodleaves,18,5
415 pitreeleaves,18,1 pitreeleaves,18,5
416 pilogleaves,18,1 pilogleaves,18,5
417 pitrunkleaves,18,1 pitrunkleaves,18,5
418 piwoodleaves,18,1 piwoodleaves,18,5
419 pinetreeleaf,18,1 pinetreeleaf,18,5
420 pinelogleaf,18,1 pinelogleaf,18,5
421 pinetrunkleaf,18,1 pinetrunkleaf,18,5
422 pinewoodleaf,18,1 pinewoodleaf,18,5
423 ptreeleaf,18,1 ptreeleaf,18,5
424 plogleaf,18,1 plogleaf,18,5
425 ptrunkleaf,18,1 ptrunkleaf,18,5
426 pwoodleaf,18,1 pwoodleaf,18,5
427 pitreeleaf,18,1 pitreeleaf,18,5
428 pilogleaf,18,1 pilogleaf,18,5
429 pitrunkleaf,18,1 pitrunkleaf,18,5
430 piwoodleaf,18,1 piwoodleaf,18,5
431 birchleaves,18,2 birchleaves,18,6
432 birchleaf,18,2 birchleaf,18,6
433 birchtreeleaves,18,2 birchtreeleaves,18,6
434 birchlogleaves,18,2 birchlogleaves,18,6
435 birchtrunkleaves,18,2 birchtrunkleaves,18,6
436 birchwoodleaves,18,2 birchwoodleaves,18,6
437 btreeleaves,18,2 btreeleaves,18,6
438 blogleaves,18,2 blogleaves,18,6
439 btrunkleaves,18,2 btrunkleaves,18,6
440 bwoodleaves,18,2 bwoodleaves,18,6
441 bitreeleaves,18,2 bitreeleaves,18,6
442 bilogleaves,18,2 bilogleaves,18,6
443 bitrunkleaves,18,2 bitrunkleaves,18,6
444 biwoodleaves,18,2 biwoodleaves,18,6
445 birchtreeleaf,18,2 birchtreeleaf,18,6
446 birchlogleaf,18,2 birchlogleaf,18,6
447 birchtrunkleaf,18,2 birchtrunkleaf,18,6
448 birchwoodleaf,18,2 birchwoodleaf,18,6
449 btreeleaf,18,2 btreeleaf,18,6
450 blogleaf,18,2 blogleaf,18,6
451 btrunkleaf,18,2 btrunkleaf,18,6
452 bwoodleaf,18,2 bwoodleaf,18,6
453 bitreeleaf,18,2 bitreeleaf,18,6
454 bilogleaf,18,2 bilogleaf,18,6
455 bitrunkleaf,18,2 bitrunkleaf,18,6
456 biwoodleaf,18,2 biwoodleaf,18,6
457 sponge,19,0
458 glass,20,0
459 lapislazuliore,21,0

4
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
View File

@ -85,7 +85,9 @@ public class EssentialsProtectBlockListener extends BlockListener
&& user.isAuthorized("essentials.protect")) && user.isAuthorized("essentials.protect"))
{ {
protect.add(blockPlaced); protect.add(blockPlaced);
if (prot.getSettingBool(ProtectConfig.protect_against_signs)) if (prot.getSettingBool(ProtectConfig.protect_against_signs)
&& event.getBlockAgainst().getType() != Material.SIGN_POST
&& event.getBlockAgainst().getType() != Material.WALL_SIGN)
{ {
protect.add(event.getBlockAgainst()); protect.add(event.getBlockAgainst());
} }