Upstream
/
furniture
mirror of https://github.com/Ste3et/furniture.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Hammock Permission Issue

This commit is contained in:
Ste3et_C0st 2021-06-04 17:19:48 +02:00
parent 71b4f43abd
commit cf21e9bb83
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -7,7 +7,7 @@
<furniture.tag></furniture.tag>
</properties>
<version>3.4.7${furniture.tag}</version>
<version>3.4.8${furniture.tag}</version>
<build>
<defaultGoal>clean package install</defaultGoal>
<sourceDirectory>src</sourceDirectory>

35
src/de/Ste3et_C0st/Furniture/Objects/outdoor/hammock.java
View File

@ -21,11 +21,12 @@ public class hammock extends Furniture{
if(getObjID() == null) return;
if(getObjID().getSQLAction().equals(SQLAction.REMOVE)) return;
if(player == null) return;
if(canBuild(player)) {
ItemStack stack = player.getInventory().getItemInMainHand();
if(stack!=null){
if(isMaterial(stack.getType())){
if(stack.getType().name().contains("BANNER")){
ItemStack stack = player.getInventory().getItemInMainHand();
if(stack!=null){
if(isMaterial(stack.getType())){
if(stack.getType().name().contains("BANNER")){
if(canBuild(player)) {
for(fEntity entity : getfAsList()){
if(entity.getHelmet()!=null){
if(entity.getHelmet().getType().name().contains("BANNER")){
@ -35,7 +36,10 @@ public class hammock extends Furniture{
}
consumeItem(player);
update();
}else{
return;
}
}else{
if(canBuild(player)) {
for(fEntity entity : getfAsList()){
if(entity.getHelmet()!=null){
if(entity.getHelmet().getType().toString().toLowerCase().endsWith("log")){
@ -45,19 +49,20 @@ public class hammock extends Furniture{
}
consumeItem(player);
update();
}
}else {
for(fEntity entity : getfAsList()){
if(entity.getName().startsWith("#SITZ#")){
if(entity.getPassenger()==null||entity.getPassenger().isEmpty()){
entity.setPassenger(player);
}
return;
}
return;
}
}
}
}
for(fEntity entity : getfAsList()){
if(entity.getName().startsWith("#SITZ#")){
if(entity.getPassenger()==null||entity.getPassenger().isEmpty()){
entity.setPassenger(player);
}
return;
}
}
}
@Override